diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 15:57:18 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 15:57:18 +0000 |
| commit | 689f7933ec48cb8855f47fdc00dc5c5c41d689a8 (patch) | |
| tree | 305ccb528926ebf07f6bb5443c9aed5c182d66b1 /lib/api | |
| parent | 657c4c18be9391d2e021f47294ce929812c9277f (diff) | |
| parent | b88e82ff0a1bca9687b5579208ba05a99e41a464 (diff) | |
| download | gitlab-ce-689f7933ec48cb8855f47fdc00dc5c5c41d689a8.tar.gz | |
Merge branch 'master' into 27955-mr-notification-use-pipeline-language
* master:
Remove a transient failure from spec/requests/api/groups_spec.rb
Update PROCESS.md
Update MergeRequest API state_event option documentation
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 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, |