diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml index c06e0b75a3f9da2d889940761ef31742b9c8e8a5..9fdba3f5543f13e88bf14ae51b373d459a453a97 100644 --- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml +++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml @@ -2,12 +2,6 @@ # Cop supports --autocorrect. Layout/LineEndStringConcatenationIndentation: Exclude: - - 'app/components/diffs/overflow_warning_component.rb' - - 'app/controllers/concerns/controller_with_cross_project_access_check.rb' - - 'app/controllers/import/github_controller.rb' - - 'app/controllers/projects/google_cloud/databases_controller.rb' - - 'app/controllers/projects/merge_requests/conflicts_controller.rb' - - 'app/graphql/mutations/achievements/update_user_achievement_priorities.rb' - 'app/graphql/mutations/award_emojis/toggle.rb' - 'app/graphql/mutations/boards/issues/issue_move_list.rb' - 'app/graphql/mutations/ci/job_token_scope/add_project.rb' diff --git a/app/components/diffs/overflow_warning_component.rb b/app/components/diffs/overflow_warning_component.rb index c70997f6665ede82988f81f6f8bf23b6bca3251c..a124c32951caad51e8e351f524e0512a7d469191 100644 --- a/app/components/diffs/overflow_warning_component.rb +++ b/app/components/diffs/overflow_warning_component.rb @@ -55,7 +55,7 @@ def merge_request? def message_text _( "For a faster browsing experience, only %{strong_open}%{display_size} of %{real_size}%{strong_close} " \ - "files are shown. Download one of the files below to see all changes." + "files are shown. Download one of the files below to see all changes." ) end end diff --git a/app/controllers/concerns/controller_with_cross_project_access_check.rb b/app/controllers/concerns/controller_with_cross_project_access_check.rb index eace8e9464b72d11b68b51cd6b42b7ab478b2b28..3ff9f9cd6e9c4f4fdba9ac55a4f70a504c9fe3f8 100644 --- a/app/controllers/concerns/controller_with_cross_project_access_check.rb +++ b/app/controllers/concerns/controller_with_cross_project_access_check.rb @@ -17,7 +17,7 @@ def authorize_cross_project_page! rejection_message = _( "This page is unavailable because you are not allowed to read information "\ - "across multiple projects." + "across multiple projects." ) access_denied!(rejection_message) end diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 804c41c4fd1cf39eaa1b75edcfdcc091086e9d70..b554a1e37a9ceac694299a6d147bf936fa274452 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -261,7 +261,7 @@ def provider_forbidden alert_message = safe_format( s_( "GithubImport|Your GitHub personal access token does not have the required scope to import. " \ - "%{link_start}Learn More%{link_end}." + "%{link_start}Learn More%{link_end}." ), tag_pair_docs_link ) diff --git a/app/controllers/projects/google_cloud/databases_controller.rb b/app/controllers/projects/google_cloud/databases_controller.rb index 9023b8a5fa64655ec16042581751a12a9430a05e..ad4bd505c3e53537d9237efe703421a6c763142e 100644 --- a/app/controllers/projects/google_cloud/databases_controller.rb +++ b/app/controllers/projects/google_cloud/databases_controller.rb @@ -136,16 +136,16 @@ def description(product) case product when :postgres s_('CloudSeed|Cloud SQL instances are fully managed, relational PostgreSQL databases. '\ - 'Google handles replication, patch management, and database management '\ - 'to ensure availability and performance.') + 'Google handles replication, patch management, and database management '\ + 'to ensure availability and performance.') when :mysql s_('Cloud SQL instances are fully managed, relational MySQL databases. '\ - 'Google handles replication, patch management, and database management '\ - 'to ensure availability and performance.') + 'Google handles replication, patch management, and database management '\ + 'to ensure availability and performance.') else s_('Cloud SQL instances are fully managed, relational SQL Server databases. ' \ - 'Google handles replication, patch management, and database management ' \ - 'to ensure availability and performance.') + 'Google handles replication, patch management, and database management ' \ + 'to ensure availability and performance.') end end end diff --git a/app/controllers/projects/merge_requests/conflicts_controller.rb b/app/controllers/projects/merge_requests/conflicts_controller.rb index c4055ca57ce331f549d4d2a8541ed78665d19b71..a8a09d93460897afe2905dc7702f5f81ba67cbd0 100644 --- a/app/controllers/projects/merge_requests/conflicts_controller.rb +++ b/app/controllers/projects/merge_requests/conflicts_controller.rb @@ -25,13 +25,13 @@ def show elsif @merge_request.can_be_merged? render json: { message: _('The merge conflicts for this merge request have already been resolved. ' \ - 'Please return to the merge request.'), + 'Please return to the merge request.'), type: 'error' } else render json: { message: _('The merge conflicts for this merge request cannot be resolved through GitLab. ' \ - 'Please try to resolve them locally.'), + 'Please try to resolve them locally.'), type: 'error' } end diff --git a/app/graphql/mutations/achievements/update_user_achievement_priorities.rb b/app/graphql/mutations/achievements/update_user_achievement_priorities.rb index 077b4810fdcc5cd680fa8354ccf0d23556fc462e..f7501a5745a9cb9856a1bf2677ddc21c6e6bc343 100644 --- a/app/graphql/mutations/achievements/update_user_achievement_priorities.rb +++ b/app/graphql/mutations/achievements/update_user_achievement_priorities.rb @@ -14,7 +14,7 @@ class UpdateUserAchievementPriorities < BaseMutation [::Types::GlobalIDType[::Achievements::UserAchievement]], required: true, description: 'Global IDs of the user achievements being prioritized, ' \ - 'ordered from highest to lowest priority.' + 'ordered from highest to lowest priority.' def resolve(args) user_achievements = args.delete(:user_achievement_ids).map { |id| find_object(id) }