diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 11:02:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 11:02:22 +0000 |
| commit | 3ed8078507b6cb37c7dd85f2fc22c9494faf9e1e (patch) | |
| tree | 21aa75227bf35bc41b31c22f0f26f986e00c0108 /lib/api | |
| parent | da251c6436d6e17b18911d37c1b18314fb29329d (diff) | |
| parent | c607b358241712af0d6b442b8e7a277cb6ba8a38 (diff) | |
| download | gitlab-ce-3ed8078507b6cb37c7dd85f2fc22c9494faf9e1e.tar.gz | |
Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"
Closes #25569
See merge request gitlab-org/gitlab-ce!23966
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 8c1951cc535..132b19164d0 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -179,7 +179,7 @@ module API optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request' optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request' optional :labels, type: String, desc: 'Comma-separated list of label names' - optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging' + optional :remove_source_branch, type: Boolean, desc: 'Delete source branch when merging' optional :allow_collaboration, type: Boolean, desc: 'Allow commits from members who can merge to the target branch' optional :allow_maintainer_to_push, type: Boolean, as: :allow_collaboration, desc: '[deprecated] See allow_collaboration' optional :squash, type: Grape::API::Boolean, desc: 'When true, the commits will be squashed into a single commit on merge' |