summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-10 12:33:38 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-10 12:33:38 +0000
commit199b17e5569015bf76ddd9364fc555a3a385c564 (patch)
tree34912b19392fdec6b12c06aaae04d722a59e3836 /lib
parentde65731631c741db65cf6e6297715c936a7aaf10 (diff)
parent744df2dca8528a61e47091b2d153f087565f342c (diff)
downloadgitlab-ce-199b17e5569015bf76ddd9364fc555a3a385c564.tar.gz
Merge branch 'jej-update-mr-state-event-docs' into 'master'
Update MergeRequest API state_event option documentation Closes #25566 See merge request !8077
Diffstat (limited to 'lib')
-rw-r--r--lib/api/merge_requests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 782147883c8..8e09a6f7354 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -138,7 +138,7 @@ module API
params do
optional :title, type: String, allow_blank: false, desc: 'The title of the merge request'
optional :target_branch, type: String, allow_blank: false, desc: 'The target branch'
- optional :state_event, type: String, values: %w[close reopen merge],
+ optional :state_event, type: String, values: %w[close reopen],
desc: 'Status of the merge request'
use :optional_params
at_least_one_of :title, :target_branch, :description, :assignee_id,