Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/graphql/mutations/merge_requests/accept.rb')
-rw-r--r--app/graphql/mutations/merge_requests/accept.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/graphql/mutations/merge_requests/accept.rb b/app/graphql/mutations/merge_requests/accept.rb
index 9994f793a01..d16b2327f2d 100644
--- a/app/graphql/mutations/merge_requests/accept.rb
+++ b/app/graphql/mutations/merge_requests/accept.rb
@@ -23,20 +23,20 @@ module Mutations
as: :auto_merge_strategy,
description: 'How to merge this merge request.'
- argument :commit_message, ::GraphQL::STRING_TYPE,
+ argument :commit_message, ::GraphQL::Types::String,
required: false,
description: 'Custom merge commit message.'
- argument :squash_commit_message, ::GraphQL::STRING_TYPE,
+ argument :squash_commit_message, ::GraphQL::Types::String,
required: false,
description: 'Custom squash commit message (if squash is true).'
- argument :sha, ::GraphQL::STRING_TYPE,
+ argument :sha, ::GraphQL::Types::String,
required: true,
- description: 'The HEAD SHA at the time when this merge was requested.'
+ description: 'HEAD SHA at the time when this merge was requested.'
- argument :should_remove_source_branch, ::GraphQL::BOOLEAN_TYPE,
+ argument :should_remove_source_branch, ::GraphQL::Types::Boolean,
required: false,
description: 'Should the source branch be removed.'
- argument :squash, ::GraphQL::BOOLEAN_TYPE,
+ argument :squash, ::GraphQL::Types::Boolean,
required: false,
default_value: false,
description: 'Squash commits on the source branch before merge.'