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

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

Lint issue fix in Layout/LineEndStringConcatenationIndentation 3

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



Merged-by: default avatarAditya Tiwari <atiwari@gitlab.com>
Approved-by: default avatarAditya Tiwari <atiwari@gitlab.com>
Co-authored-by: default avatarArchish <archishthakkar@gmail.com>
No related branches found
No related tags found
无相关合并请求
...@@ -14,12 +14,6 @@ Layout/LineEndStringConcatenationIndentation: ...@@ -14,12 +14,6 @@ Layout/LineEndStringConcatenationIndentation:
- 'app/graphql/mutations/concerns/mutations/validate_time_estimate.rb' - 'app/graphql/mutations/concerns/mutations/validate_time_estimate.rb'
- 'app/graphql/mutations/container_registry/protection/rule/create.rb' - 'app/graphql/mutations/container_registry/protection/rule/create.rb'
- 'app/graphql/mutations/container_registry/protection/rule/delete.rb' - 'app/graphql/mutations/container_registry/protection/rule/delete.rb'
- 'app/graphql/mutations/container_registry/protection/rule/update.rb'
- 'app/graphql/mutations/design_management/upload.rb'
- 'app/graphql/mutations/issues/bulk_update.rb'
- 'app/graphql/mutations/issues/update.rb'
- 'app/graphql/mutations/members/projects/bulk_update.rb'
- 'app/graphql/mutations/merge_requests/update.rb'
- 'app/graphql/resolvers/ci/config_resolver.rb' - 'app/graphql/resolvers/ci/config_resolver.rb'
- 'app/graphql/resolvers/ci/runners_resolver.rb' - 'app/graphql/resolvers/ci/runners_resolver.rb'
- 'app/graphql/resolvers/ci/template_resolver.rb' - 'app/graphql/resolvers/ci/template_resolver.rb'
......
...@@ -7,8 +7,8 @@ module Rule ...@@ -7,8 +7,8 @@ module Rule
class Update < ::Mutations::BaseMutation class Update < ::Mutations::BaseMutation
graphql_name 'UpdateContainerRegistryProtectionRule' graphql_name 'UpdateContainerRegistryProtectionRule'
description 'Updates a container registry protection rule to restrict access to project containers. ' \ description 'Updates a container registry protection rule to restrict access to project containers. ' \
'You can prevent users without certain roles from altering containers. ' \ 'You can prevent users without certain roles from altering containers. ' \
'Available only when feature flag `container_registry_protected_containers` is enabled.' 'Available only when feature flag `container_registry_protected_containers` is enabled.'
authorize :admin_container_image authorize :admin_container_image
......
...@@ -18,7 +18,7 @@ class Upload < Base ...@@ -18,7 +18,7 @@ class Upload < Base
field :skipped_designs, [Types::DesignManagement::DesignType], field :skipped_designs, [Types::DesignManagement::DesignType],
null: false, null: false,
description: "Any designs that were skipped from the upload due to there " \ description: "Any designs that were skipped from the upload due to there " \
"being no change to their content since their last version" "being no change to their content since their last version"
def resolve(project_path:, iid:, files:) def resolve(project_path:, iid:, files:)
issue = authorized_find!(project_path: project_path, iid: iid) issue = authorized_find!(project_path: project_path, iid: iid)
......
...@@ -10,23 +10,23 @@ class BulkUpdate < BaseMutation ...@@ -10,23 +10,23 @@ class BulkUpdate < BaseMutation
MAX_ISSUES = 100 MAX_ISSUES = 100
description 'Allows updating several properties for a set of issues. ' \ description 'Allows updating several properties for a set of issues. ' \
'Does nothing if the `bulk_update_issues_mutation` feature flag is disabled.' 'Does nothing if the `bulk_update_issues_mutation` feature flag is disabled.'
argument :parent_id, ::Types::GlobalIDType[::IssueParent], argument :parent_id, ::Types::GlobalIDType[::IssueParent],
required: true, required: true,
description: 'Global ID of the parent to which the bulk update will be scoped. ' \ description: 'Global ID of the parent to which the bulk update will be scoped. ' \
'The parent can be a project. The parent can also be a group (Premium and Ultimate only). ' \ 'The parent can be a project. The parent can also be a group (Premium and Ultimate only). ' \
'Example `IssueParentID` are `"gid://gitlab/Project/1"` and `"gid://gitlab/Group/1"`.' 'Example `IssueParentID` are `"gid://gitlab/Project/1"` and `"gid://gitlab/Group/1"`.'
argument :ids, [::Types::GlobalIDType[::Issue]], argument :ids, [::Types::GlobalIDType[::Issue]],
required: true, required: true,
description: 'Global ID array of the issues that will be updated. ' \ description: 'Global ID array of the issues that will be updated. ' \
"IDs that the user can\'t update will be ignored. A max of #{MAX_ISSUES} can be provided." "IDs that the user can\'t update will be ignored. A max of #{MAX_ISSUES} can be provided."
argument :assignee_ids, [::Types::GlobalIDType[::User]], argument :assignee_ids, [::Types::GlobalIDType[::User]],
required: false, required: false,
description: 'Global ID array of the users that will be assigned to the given issues. ' \ description: 'Global ID array of the users that will be assigned to the given issues. ' \
'Existing assignees will be replaced with the ones on this list.' 'Existing assignees will be replaced with the ones on this list.'
argument :milestone_id, ::Types::GlobalIDType[::Milestone], argument :milestone_id, ::Types::GlobalIDType[::Milestone],
required: false, required: false,
......
...@@ -35,7 +35,7 @@ class Update < Base ...@@ -35,7 +35,7 @@ class Update < Base
argument :time_estimate, GraphQL::Types::String, argument :time_estimate, GraphQL::Types::String,
required: false, required: false,
description: 'Estimated time to complete the issue. ' \ description: 'Estimated time to complete the issue. ' \
'Use `null` or `0` to remove the current estimate.' 'Use `null` or `0` to remove the current estimate.'
def resolve(project_path:, iid:, **args) def resolve(project_path:, iid:, **args)
issue = authorized_find!(project_path: project_path, iid: iid) issue = authorized_find!(project_path: project_path, iid: iid)
......
...@@ -6,7 +6,7 @@ module Projects ...@@ -6,7 +6,7 @@ module Projects
class BulkUpdate < BulkUpdateBase class BulkUpdate < BulkUpdateBase
graphql_name 'ProjectMemberBulkUpdate' graphql_name 'ProjectMemberBulkUpdate'
description 'Updates multiple members of a project. ' \ description 'Updates multiple members of a project. ' \
'To use this mutation, you must have at least the Maintainer role.' 'To use this mutation, you must have at least the Maintainer role.'
authorize :admin_project_member authorize :admin_project_member
......
...@@ -29,7 +29,7 @@ class Update < Base ...@@ -29,7 +29,7 @@ class Update < Base
argument :time_estimate, GraphQL::Types::String, argument :time_estimate, GraphQL::Types::String,
required: false, required: false,
description: 'Estimated time to complete the merge request. ' \ description: 'Estimated time to complete the merge request. ' \
'Use `null` or `0` to remove the current estimate.' 'Use `null` or `0` to remove the current estimate.'
def resolve(project_path:, iid:, **args) def resolve(project_path:, iid:, **args)
merge_request = authorized_find!(project_path: project_path, iid: iid) merge_request = authorized_find!(project_path: project_path, iid: iid)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册