diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/graphql/mutations/merge_requests/accept.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/graphql/mutations/merge_requests/accept.rb')
| -rw-r--r-- | app/graphql/mutations/merge_requests/accept.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/graphql/mutations/merge_requests/accept.rb b/app/graphql/mutations/merge_requests/accept.rb index ebd9e2b8fdd..64572091379 100644 --- a/app/graphql/mutations/merge_requests/accept.rb +++ b/app/graphql/mutations/merge_requests/accept.rb @@ -21,14 +21,14 @@ module Mutations ::Types::MergeStrategyEnum, required: false, as: :auto_merge_strategy, - description: 'How to merge this merge request.' + description: 'How to merge the merge request.' argument :commit_message, ::GraphQL::Types::String, required: false, description: 'Custom merge commit message.' argument :sha, ::GraphQL::Types::String, required: true, - description: 'HEAD SHA at the time when this merge was requested.' + description: 'HEAD SHA at the time when the merge was requested.' argument :squash_commit_message, ::GraphQL::Types::String, required: false, description: 'Custom squash commit message (if squash is true).' |