Skip to content
代码片段 群组 项目
未验证 提交 94897e7c 编辑于 作者: Andrew Fontaine's avatar Andrew Fontaine 提交者: GitLab
浏览文件

Merge branch '239356-LineEndStringConcatenationIndentation-1' into 'master'

Lint issue fix in Layout/LineEndStringConcatenationIndentation 1

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164692



Merged-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Approved-by: default avatarLucas Charles <me@lucascharles.me>
Approved-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Co-authored-by: default avatarArchish <archishthakkar@gmail.com>
No related branches found
No related tags found
无相关合并请求
......@@ -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'
......
......@@ -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
......
......@@ -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
......
......@@ -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
)
......
......@@ -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
......
......@@ -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
......
......@@ -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) }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册