From 65b89ae1d857b860e6e23bdb43a75481ba4302ee Mon Sep 17 00:00:00 2001
From: Archish Thakkar <archishthakkar@gmail.com>
Date: Tue, 1 Oct 2024 15:46:39 +0000
Subject: [PATCH] Lint issue fix in
Layout/LineEndStringConcatenationIndentation 1
---
.../line_end_string_concatenation_indentation.yml | 6 ------
app/components/diffs/overflow_warning_component.rb | 2 +-
.../controller_with_cross_project_access_check.rb | 2 +-
app/controllers/import/github_controller.rb | 2 +-
.../projects/google_cloud/databases_controller.rb | 12 ++++++------
.../projects/merge_requests/conflicts_controller.rb | 4 ++--
.../update_user_achievement_priorities.rb | 2 +-
7 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
index c06e0b75a3f9..9fdba3f5543f 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 c70997f6665e..a124c32951ca 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 eace8e9464b7..3ff9f9cd6e9c 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 804c41c4fd1c..b554a1e37a9c 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 9023b8a5fa64..ad4bd505c3e5 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 c4055ca57ce3..a8a09d934608 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 077b4810fdcc..f7501a5745a9 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) }
--
GitLab