From e902f462c213d1bb0cc56f298c7bef01befa0616 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Mon, 19 Nov 2018 23:08:23 +0900 Subject: [PATCH] Eliminate duplicated words Signed-off-by: Takuya Noguchi --- app/assets/javascripts/blob/file_template_mediator.js | 2 +- app/assets/javascripts/labels.js | 2 +- app/models/concerns/blocks_json_serialization.rb | 2 +- app/models/namespace.rb | 2 +- app/services/commits/commit_patch_service.rb | 2 +- app/services/notification_service.rb | 2 +- app/views/profiles/personal_access_tokens/index.html.haml | 2 +- config/boot.rb | 2 +- db/migrate/20180628124813_alter_web_hook_logs_indexes.rb | 2 +- lib/gitlab/gfm/uploads_rewriter.rb | 2 +- lib/gitlab/git/repository.rb | 2 +- lib/gitlab/i18n/po_linter.rb | 2 +- lib/gitlab/import/merge_request_creator.rb | 8 ++++---- spec/controllers/projects/blob_controller_spec.rb | 2 +- .../merge_request/user_assigns_themselves_spec.rb | 2 +- ...er_resolves_diff_notes_and_discussions_resolve_spec.rb | 2 +- .../features/projects/wiki/user_creates_wiki_page_spec.rb | 2 +- spec/finders/pipeline_schedules_finder_spec.rb | 2 +- spec/fixtures/emails/paragraphs.eml | 2 +- spec/initializers/secret_token_spec.rb | 2 +- spec/javascripts/ide/components/ide_spec.js | 2 +- .../ide/stores/modules/branches/actions_spec.js | 2 +- .../ide/stores/modules/merge_requests/actions_spec.js | 2 +- spec/lib/banzai/filter/absolute_link_filter_spec.rb | 2 +- spec/lib/gitlab/auth/o_auth/user_spec.rb | 2 +- spec/lib/gitlab/ci/build/policy/changes_spec.rb | 2 +- spec/lib/gitlab/ci/config/external/file/local_spec.rb | 2 +- .../gitlab/ci/pipeline/expression/lexeme/string_spec.rb | 2 +- spec/lib/gitlab/contributions_calendar_spec.rb | 2 +- spec/lib/gitlab/cross_project_access/check_info_spec.rb | 4 ++-- .../v1/rename_namespaces_spec.rb | 2 +- spec/lib/gitlab/diff/inline_diff_marker_spec.rb | 2 +- spec/lib/gitlab/email/reply_parser_spec.rb | 2 +- spec/lib/gitlab/git/merge_base_spec.rb | 2 +- spec/lib/gitlab/multi_collection_paginator_spec.rb | 2 +- spec/models/ci/build_trace_chunk_spec.rb | 4 ++-- spec/models/list_spec.rb | 4 ++-- spec/policies/ci/pipeline_schedule_policy_spec.rb | 4 ++-- spec/policies/project_policy_spec.rb | 2 +- .../merge_when_pipeline_succeeds_service_spec.rb | 2 +- spec/services/users/set_status_service_spec.rb | 2 +- spec/support/import_export/export_file_helper.rb | 2 +- 42 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index addacf29f1e..106fe2e0cef 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -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 => { diff --git a/app/assets/javascripts/labels.js b/app/assets/javascripts/labels.js index 2bc09237495..cd8cf0d354c 100644 --- a/app/assets/javascripts/labels.js +++ b/app/assets/javascripts/labels.js @@ -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 diff --git a/app/models/concerns/blocks_json_serialization.rb b/app/models/concerns/blocks_json_serialization.rb index d346da1ba4b..18c00532d78 100644 --- a/app/models/concerns/blocks_json_serialization.rb +++ b/app/models/concerns/blocks_json_serialization.rb @@ -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 diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 4a6627d3ca1..11b03846f0b 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -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)) diff --git a/app/services/commits/commit_patch_service.rb b/app/services/commits/commit_patch_service.rb index 9253cfaac20..49113c3c691 100644 --- a/app/services/commits/commit_patch_service.rb +++ b/app/services/commits/commit_patch_service.rb @@ -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 diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index fb9c18ea75d..5904bfbf88d 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -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) diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index c1e1eaff942..4c18398e3dc 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -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 diff --git a/config/boot.rb b/config/boot.rb index 1aeacdabbad..725473ac7f6 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -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 diff --git a/db/migrate/20180628124813_alter_web_hook_logs_indexes.rb b/db/migrate/20180628124813_alter_web_hook_logs_indexes.rb index 1878e76811d..289c87b30d2 100644 --- a/db/migrate/20180628124813_alter_web_hook_logs_indexes.rb +++ b/db/migrate/20180628124813_alter_web_hook_logs_indexes.rb @@ -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. diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb index 3f06badf5d9..2d1c9ac40ae 100644 --- a/lib/gitlab/gfm/uploads_rewriter.rb +++ b/lib/gitlab/gfm/uploads_rewriter.rb @@ -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 diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 993955d1a6b..e75f4ec1ec5 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -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 diff --git a/lib/gitlab/i18n/po_linter.rb b/lib/gitlab/i18n/po_linter.rb index 644ef8c8589..3e9a035010f 100644 --- a/lib/gitlab/i18n/po_linter.rb +++ b/lib/gitlab/i18n/po_linter.rb @@ -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? diff --git a/lib/gitlab/import/merge_request_creator.rb b/lib/gitlab/import/merge_request_creator.rb index a01951b0762..8291372bba9 100644 --- a/lib/gitlab/import/merge_request_creator.rb +++ b/lib/gitlab/import/merge_request_creator.rb @@ -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 diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 5fdf7f1229d..3c5a21c47fa 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -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 diff --git a/spec/features/merge_request/user_assigns_themselves_spec.rb b/spec/features/merge_request/user_assigns_themselves_spec.rb index b6b38186a22..41cc7cef777 100644 --- a/spec/features/merge_request/user_assigns_themselves_spec.rb +++ b/spec/features/merge_request/user_assigns_themselves_spec.rb @@ -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 diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 8a16c011067..87613a4fdce 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -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' diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb index b30286e4446..571104d3467 100644 --- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb @@ -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!") diff --git a/spec/finders/pipeline_schedules_finder_spec.rb b/spec/finders/pipeline_schedules_finder_spec.rb index b9538649b3f..2fefa0280d1 100644 --- a/spec/finders/pipeline_schedules_finder_spec.rb +++ b/spec/finders/pipeline_schedules_finder_spec.rb @@ -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 diff --git a/spec/fixtures/emails/paragraphs.eml b/spec/fixtures/emails/paragraphs.eml index 2d5b5283f7e..6ab319fa83a 100644 --- a/spec/fixtures/emails/paragraphs.eml +++ b/spec/fixtures/emails/paragraphs.eml @@ -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 diff --git a/spec/initializers/secret_token_spec.rb b/spec/initializers/secret_token_spec.rb index c3dfd7bedbe..6366be30079 100644 --- a/spec/initializers/secret_token_spec.rb +++ b/spec/initializers/secret_token_spec.rb @@ -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') diff --git a/spec/javascripts/ide/components/ide_spec.js b/spec/javascripts/ide/components/ide_spec.js index c02a1ad246c..55f40be0e4e 100644 --- a/spec/javascripts/ide/components/ide_spec.js +++ b/spec/javascripts/ide/components/ide_spec.js @@ -29,7 +29,7 @@ describe('ide component', () => { resetStore(vm.$store); }); - it('does not render right right when no files open', () => { + it('does not render right when no files open', () => { expect(vm.$el.querySelector('.panel-right')).toBeNull(); }); diff --git a/spec/javascripts/ide/stores/modules/branches/actions_spec.js b/spec/javascripts/ide/stores/modules/branches/actions_spec.js index 2b3eac282f6..9c61ba3d1a6 100644 --- a/spec/javascripts/ide/stores/modules/branches/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/branches/actions_spec.js @@ -59,7 +59,7 @@ describe('IDE branches actions', () => { }); describe('receiveBranchesError', () => { - it('should should commit error', done => { + it('should commit error', done => { testAction( receiveBranchesError, { search: TEST_SEARCH }, diff --git a/spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js b/spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js index 62699143a91..04925d37ac4 100644 --- a/spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js @@ -39,7 +39,7 @@ describe('IDE merge requests actions', () => { }); describe('receiveMergeRequestsError', () => { - it('should should commit error', done => { + it('should commit error', done => { testAction( receiveMergeRequestsError, { type: 'created', search: '' }, diff --git a/spec/lib/banzai/filter/absolute_link_filter_spec.rb b/spec/lib/banzai/filter/absolute_link_filter_spec.rb index a3ad056efcd..50be551cd90 100644 --- a/spec/lib/banzai/filter/absolute_link_filter_spec.rb +++ b/spec/lib/banzai/filter/absolute_link_filter_spec.rb @@ -28,7 +28,7 @@ describe Banzai::Filter::AbsoluteLinkFilter do end context 'if relative_url_root is set' do - it 'joins the url without without doubling the path' do + it 'joins the url without doubling the path' do allow(Gitlab.config.gitlab).to receive(:url).and_return("#{fake_url}/gitlab/") doc = filter(link("/gitlab/foo", 'gfm'), only_path_context) expect(doc.at_css('a')['href']).to eq "#{fake_url}/gitlab/foo" diff --git a/spec/lib/gitlab/auth/o_auth/user_spec.rb b/spec/lib/gitlab/auth/o_auth/user_spec.rb index 3a8667e434d..dcbd12fe190 100644 --- a/spec/lib/gitlab/auth/o_auth/user_spec.rb +++ b/spec/lib/gitlab/auth/o_auth/user_spec.rb @@ -498,7 +498,7 @@ describe Gitlab::Auth::OAuth::User do end end - describe 'ensure backwards compatibility with with sync email from provider option' do + describe 'ensure backwards compatibility with sync email from provider option' do let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') } before do diff --git a/spec/lib/gitlab/ci/build/policy/changes_spec.rb b/spec/lib/gitlab/ci/build/policy/changes_spec.rb index 523d00c1272..5fee37bb43e 100644 --- a/spec/lib/gitlab/ci/build/policy/changes_spec.rb +++ b/spec/lib/gitlab/ci/build/policy/changes_spec.rb @@ -4,7 +4,7 @@ describe Gitlab::Ci::Build::Policy::Changes do set(:project) { create(:project) } describe '#satisfied_by?' do - describe 'paths matching matching' do + describe 'paths matching' do let(:pipeline) do build(:ci_empty_pipeline, project: project, ref: 'master', diff --git a/spec/lib/gitlab/ci/config/external/file/local_spec.rb b/spec/lib/gitlab/ci/config/external/file/local_spec.rb index 2708d8d5b6b..541deb13b97 100644 --- a/spec/lib/gitlab/ci/config/external/file/local_spec.rb +++ b/spec/lib/gitlab/ci/config/external/file/local_spec.rb @@ -37,7 +37,7 @@ describe Gitlab::Ci::Config::External::File::Local do end describe '#content' do - context 'with a a valid file' do + context 'with a valid file' do let(:local_file_content) do <<~HEREDOC before_script: diff --git a/spec/lib/gitlab/ci/pipeline/expression/lexeme/string_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/lexeme/string_spec.rb index 1ccb792d1da..f54ef492e6d 100644 --- a/spec/lib/gitlab/ci/pipeline/expression/lexeme/string_spec.rb +++ b/spec/lib/gitlab/ci/pipeline/expression/lexeme/string_spec.rb @@ -93,7 +93,7 @@ describe Gitlab::Ci::Pipeline::Expression::Lexeme::String do end describe '#evaluate' do - it 'returns string value it is is present' do + it 'returns string value if it is present' do string = described_class.new('my string') expect(string.evaluate).to eq 'my string' diff --git a/spec/lib/gitlab/contributions_calendar_spec.rb b/spec/lib/gitlab/contributions_calendar_spec.rb index 6d29044ffd5..b7924302014 100644 --- a/spec/lib/gitlab/contributions_calendar_spec.rb +++ b/spec/lib/gitlab/contributions_calendar_spec.rb @@ -135,7 +135,7 @@ describe Gitlab::ContributionsCalendar do expect(calendar(contributor).events_by_date(today)).to contain_exactly(e1, e2, e3) end - context 'when the user cannot read read cross project' do + context 'when the user cannot read cross project' do before do allow(Ability).to receive(:allowed?).and_call_original expect(Ability).to receive(:allowed?).with(user, :read_cross_project) { false } diff --git a/spec/lib/gitlab/cross_project_access/check_info_spec.rb b/spec/lib/gitlab/cross_project_access/check_info_spec.rb index 239fa364f5e..ea7393a7006 100644 --- a/spec/lib/gitlab/cross_project_access/check_info_spec.rb +++ b/spec/lib/gitlab/cross_project_access/check_info_spec.rb @@ -50,7 +50,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do expect(info.should_run?(dummy_controller)).to be_truthy end - it 'returns the the opposite of #should_skip? when the check is a skip' do + it 'returns the opposite of #should_skip? when the check is a skip' do info = described_class.new({}, nil, nil, true) expect(info).to receive(:should_skip?).with(dummy_controller).and_return(false) @@ -101,7 +101,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do expect(info.should_skip?(dummy_controller)).to be_truthy end - it 'returns the the opposite of #should_run? when the check is not a skip' do + it 'returns the opposite of #should_run? when the check is not a skip' do info = described_class.new({}, nil, nil, false) expect(info).to receive(:should_run?).with(dummy_controller).and_return(false) diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb index 0a8c77b0ad9..b6096d4faf6 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb @@ -165,7 +165,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, : end describe '#rename_namespace_dependencies' do - it "moves the the repository for a project in the namespace" do + it "moves the repository for a project in the namespace" do create(:project, :repository, :legacy_storage, namespace: namespace, path: "the-path-project") expected_repo = File.join(TestEnv.repos_path, "the-path0", "the-path-project.git") diff --git a/spec/lib/gitlab/diff/inline_diff_marker_spec.rb b/spec/lib/gitlab/diff/inline_diff_marker_spec.rb index 7296bbf5df3..97e65318059 100644 --- a/spec/lib/gitlab/diff/inline_diff_marker_spec.rb +++ b/spec/lib/gitlab/diff/inline_diff_marker_spec.rb @@ -16,7 +16,7 @@ describe Gitlab::Diff::InlineDiffMarker do end end - context "when the text text is not html safe" do + context "when the text is not html safe" do let(:rich) { "abc 'def' differs" } it 'marks the range' do diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb index 0989188f7ee..376d3accd55 100644 --- a/spec/lib/gitlab/email/reply_parser_spec.rb +++ b/spec/lib/gitlab/email/reply_parser_spec.rb @@ -49,7 +49,7 @@ describe Gitlab::Email::ReplyParser do expect(test_parse_body(fixture_file("emails/paragraphs.eml"))) .to eq( <<-BODY.strip_heredoc.chomp - 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 diff --git a/spec/lib/gitlab/git/merge_base_spec.rb b/spec/lib/gitlab/git/merge_base_spec.rb index 2f4e043a20f..8d16d451730 100644 --- a/spec/lib/gitlab/git/merge_base_spec.rb +++ b/spec/lib/gitlab/git/merge_base_spec.rb @@ -82,7 +82,7 @@ describe Gitlab::Git::MergeBase do end describe '#unknown_refs', :missing_ref do - it 'returns the the refs passed that are not part of the repository' do + it 'returns the refs passed that are not part of the repository' do expect(merge_base.unknown_refs).to contain_exactly('aaaa') end diff --git a/spec/lib/gitlab/multi_collection_paginator_spec.rb b/spec/lib/gitlab/multi_collection_paginator_spec.rb index 68bd4f93159..28cd704b05a 100644 --- a/spec/lib/gitlab/multi_collection_paginator_spec.rb +++ b/spec/lib/gitlab/multi_collection_paginator_spec.rb @@ -28,7 +28,7 @@ describe Gitlab::MultiCollectionPaginator do expect(paginator.paginate(1)).to eq(all_projects.take(3)) end - it 'fils the second page with a mixture of of the first & second collection' do + it 'fils the second page with a mixture of the first & second collection' do first_collection_element = all_projects.last second_collection_elements = all_groups.take(2) diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index 915bf134d57..59c861a74db 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -45,11 +45,11 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do is_expected.to eq(%w[redis database fog]) end - it 'returns redis store as the the lowest precedence' do + it 'returns redis store as the lowest precedence' do expect(subject.first).to eq('redis') end - it 'returns fog store as the the highest precedence' do + it 'returns fog store as the highest precedence' do expect(subject.last).to eq('fog') end end diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb index a6cc01bea5f..17dc27bd132 100644 --- a/spec/models/list_spec.rb +++ b/spec/models/list_spec.rb @@ -22,13 +22,13 @@ describe List do end describe '#destroy' do - it 'can be destroyed when when list_type is set to label' do + it 'can be destroyed when list_type is set to label' do subject = create(:list) expect(subject.destroy).to be_truthy end - it 'can not be destroyed when when list_type is set to closed' do + it 'can not be destroyed when list_type is set to closed' do subject = create(:closed_list) expect(subject.destroy).to be_falsey diff --git a/spec/policies/ci/pipeline_schedule_policy_spec.rb b/spec/policies/ci/pipeline_schedule_policy_spec.rb index f1d3cd04e32..5a56e91cd69 100644 --- a/spec/policies/ci/pipeline_schedule_policy_spec.rb +++ b/spec/policies/ci/pipeline_schedule_policy_spec.rb @@ -70,7 +70,7 @@ describe Ci::PipelineSchedulePolicy, :models do pipeline_schedule.update(owner: user) end - it 'includes abilities to do do all operations on pipeline schedule' do + it 'includes abilities to do all operations on pipeline schedule' do expect(policy).to be_allowed :play_pipeline_schedule expect(policy).to be_allowed :update_pipeline_schedule expect(policy).to be_allowed :admin_pipeline_schedule @@ -82,7 +82,7 @@ describe Ci::PipelineSchedulePolicy, :models do project.add_maintainer(user) end - it 'includes abilities to do do all operations on pipeline schedule' do + it 'includes abilities to do all operations on pipeline schedule' do expect(policy).to be_allowed :play_pipeline_schedule expect(policy).to be_allowed :update_pipeline_schedule expect(policy).to be_allowed :admin_pipeline_schedule diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb index d6bc67a9d70..69468f9ad85 100644 --- a/spec/policies/project_policy_spec.rb +++ b/spec/policies/project_policy_spec.rb @@ -223,7 +223,7 @@ describe ProjectPolicy do expect_disallowed(*other_write_abilities) end - it 'does not disable other other abilities' do + it 'does not disable other abilities' do expect_allowed(*(regular_abilities - feature_write_abilities - other_write_abilities)) end end diff --git a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb index 8838742a637..52bbd4e794d 100644 --- a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb @@ -95,7 +95,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do sha: '1234abcdef', status: 'success') end - it 'it does not merge merge request' do + it 'it does not merge request' do expect(MergeWorker).not_to receive(:perform_async) service.trigger(old_pipeline) end diff --git a/spec/services/users/set_status_service_spec.rb b/spec/services/users/set_status_service_spec.rb index 8a8458ab9de..7c26be48345 100644 --- a/spec/services/users/set_status_service_spec.rb +++ b/spec/services/users/set_status_service_spec.rb @@ -7,7 +7,7 @@ describe Users::SetStatusService do subject(:service) { described_class.new(current_user, params) } describe '#execute' do - context 'when when params are set' do + context 'when params are set' do let(:params) { { emoji: 'taurus', message: 'a random status' } } it 'creates a status' do diff --git a/spec/support/import_export/export_file_helper.rb b/spec/support/import_export/export_file_helper.rb index d9ed405baf4..a49036c3b80 100644 --- a/spec/support/import_export/export_file_helper.rb +++ b/spec/support/import_export/export_file_helper.rb @@ -123,7 +123,7 @@ module ExportFileHelper false end - # Compares model attributes with those those found in the hash + # Compares model attributes with those found in the hash # and returns true if there is a match, ignoring some excluded attributes. def safe_model?(model, excluded_attributes, parent) excluded_attributes += associations_for(model)