Skip to content
Snippets Groups Projects
Commit e902f462 authored by Takuya Noguchi's avatar Takuya Noguchi
Browse files

Eliminate duplicated words

parent d093bbae
No related branches found
No related tags found
No related merge requests found
Showing
with 23 additions and 23 deletions
Loading
Loading
@@ -124,7 +124,7 @@ export default class FileTemplateMediator {
 
selectTemplateFile(selector, query, data) {
selector.renderLoading();
// in case undo menu is already already there
// in case undo menu is already there
this.destroyUndoMenu();
this.fetchFileTemplate(selector.config.type, query, data)
.then(file => {
Loading
Loading
Loading
Loading
@@ -22,7 +22,7 @@ export default class Labels {
updateColorPreview() {
const previewColor = $('input#label_color').val();
return $('div.label-color-preview').css('background-color', previewColor);
// Updates the the preview color with the hex-color input
// Updates the preview color with the hex-color input
}
 
// Updates the preview color with a click on a suggested color
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
# Overrides `as_json` and `to_json` to raise an exception when called in order
# to prevent accidentally exposing attributes
#
# Not that that would ever happen... but just in case.
# Not that would ever happen... but just in case.
module BlocksJsonSerialization
extend ActiveSupport::Concern
 
Loading
Loading
Loading
Loading
@@ -190,7 +190,7 @@ class Namespace < ActiveRecord::Base
.base_and_ancestors
end
 
# returns all ancestors upto but excluding the the given namespace
# returns all ancestors upto but excluding the given namespace
# when no namespace is given, all ancestors upto the top are returned
def ancestors_upto(top = nil)
Gitlab::GroupHierarchy.new(self.class.where(id: id))
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ module Commits
# - user: `User` that will be the committer
# - params:
# - branch_name: `String` the branch that will be committed into
# - start_branch: `String` the branch that will will started from
# - start_branch: `String` the branch that will be started from
# - patches: `Gitlab::Git::Patches::Collection` that contains the patches
def initialize(*args)
super
Loading
Loading
Loading
Loading
@@ -50,7 +50,7 @@ class NotificationService
 
# Always notify the user about gpg key added
#
# This is a security email so it will be sent even if the user user disabled
# This is a security email so it will be sent even if the user disabled
# notifications
def new_gpg_key(gpg_key)
if gpg_key.user&.can?(:receive_notifications)
Loading
Loading
Loading
Loading
@@ -26,7 +26,7 @@
%h4.prepend-top-0
Feed token
%p
Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when when your calendar application loads a personalized calendar, and is included in those feed URLs.
Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs.
%p
It cannot be used to access any other data.
.col-lg-8.feed-token-reset
Loading
Loading
Loading
Loading
@@ -12,5 +12,5 @@ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
begin
require 'bootsnap/setup'
rescue LoadError
# bootsnap is optional dependency, so if we don't have it it's fine
# bootsnap is an optional dependency, so if we don't have it, it's fine
end
Loading
Loading
@@ -12,7 +12,7 @@ class AlterWebHookLogsIndexes < ActiveRecord::Migration
disable_ddl_transaction!
 
# "created_at" comes first so the Sidekiq worker pruning old webhook logs can
# use a composite index index.
# use a composite index.
#
# We leave the old standalone index on "web_hook_id" in place so future code
# that doesn't care about "created_at" can still use that index.
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ module Gitlab
# Class that rewrites markdown links for uploads
#
# Using a pattern defined in `FileUploader` it copies files to a new
# project and rewrites all links to uploads in in a given text.
# project and rewrites all links to uploads in a given text.
#
#
class UploadsRewriter
Loading
Loading
Loading
Loading
@@ -441,7 +441,7 @@ module Gitlab
gitaly_ref_client.find_ref_name(sha, ref_path)
end
 
# Get refs hash which key is is the commit id
# Get refs hash which key is the commit id
# and value is a Gitlab::Git::Tag or Gitlab::Git::Branch
# Note that both inherit from Gitlab::Git::Ref
def refs_hash
Loading
Loading
Loading
Loading
@@ -251,7 +251,7 @@ module Gitlab
 
def validate_variable_usage(errors, translation, required_variables)
# We don't need to validate when the message is empty.
# In this case we fall back to the default, which has all the the
# In this case we fall back to the default, which has all the
# required variables.
return if translation.empty?
 
Loading
Loading
Loading
Loading
@@ -6,10 +6,10 @@
# used for rendering Markdown) are completely unnecessary and may even lead to
# transaction timeouts.
#
# To ensure importing merge requests requests has a minimal impact and can
# complete in a reasonable time we bypass all the hooks by inserting the row
# and then retrieving it. We then only perform the additional work that is
# strictly necessary.
# To ensure importing merge requests has a minimal impact and can complete in
# a reasonable time we bypass all the hooks by inserting the row and then
# retrieving it. We then only perform the additional work that is strictly
# necessary.
module Gitlab
module Import
class MergeRequestCreator
Loading
Loading
Loading
Loading
@@ -152,7 +152,7 @@ describe Projects::BlobController do
expect(match_line['meta_data']).to have_key('new_pos')
end
 
it 'does not add top match line when when "since" is equal 1' do
it 'does not add top match line when "since" is equal 1' do
do_get(since: 1, to: 10, offset: 10, from_merge_request: true)
 
match_line = JSON.parse(response.body).first
Loading
Loading
Loading
Loading
@@ -42,7 +42,7 @@ describe 'Merge request > User assigns themselves' do
visit project_merge_request_path(project, merge_request)
end
 
it 'does not not show assignment link' do
it 'does not show assignment link' do
expect(page).not_to have_content 'Assign yourself'
end
end
Loading
Loading
Loading
Loading
@@ -325,7 +325,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
end
end
 
it 'allows user user to mark all discussions as resolved' do
it 'allows user to mark all discussions as resolved' do
page.all('.discussion-reply-holder', count: 2).each do |reply_holder|
page.within reply_holder do
click_button 'Resolve discussion'
Loading
Loading
Loading
Loading
@@ -157,7 +157,7 @@ describe "User creates wiki page" do
expect(page).to have_field("wiki[message]", with: "Create home")
end
 
it "creates a page from from the home page" do
it "creates a page from the home page" do
page.within(".wiki-form") do
fill_in(:wiki_content, with: "My awesome wiki!")
 
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ describe PipelineSchedulesFinder do
context 'when the scope is nil' do
let(:params) { { scope: nil } }
 
it 'selects all pipeline pipeline schedules' do
it 'selects all pipeline schedules' do
expect(subject.count).to be(2)
expect(subject).to include(active_schedule, inactive_schedule)
end
Loading
Loading
Loading
Loading
@@ -17,7 +17,7 @@ X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
13 Jun 2013 14:03:48 -0700 (PDT)
X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
 
Is there any reason the *old* candy can't be be kept in silos while the new candy
Is there any reason the *old* candy can't be kept in silos while the new candy
is imported into *new* silos?
 
The thing about candy is it stays delicious for a long time -- we can just keep
Loading
Loading
Loading
Loading
@@ -123,7 +123,7 @@ describe 'create_tokens' do
create_tokens
end
 
it 'sets the the keys to the values from the environment and secrets.yml' do
it 'sets the keys to the values from the environment and secrets.yml' do
create_tokens
 
expect(secrets.secret_key_base).to eq('secret_key_base')
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment