diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-01 12:25:01 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-01 12:25:01 +0300 |
| commit | 3cf683629e62fa4810512b20f4f54140591829ef (patch) | |
| tree | d0a65c34ee26e3fbb98a533d614092b51a4bf7e5 /lib/api | |
| parent | 61c17b253e6560bef377f57d39e7fb99c4659b84 (diff) | |
| parent | c2b622b2a40bdf01f3f71a8adf9aff31d535149f (diff) | |
Merge branch 'ccr/add_locked_state' into 'master'
Add locked state to merge request API
See merge request gitlab-org/gitlab-ce!20186
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index af7d2471b34..0f46bc4c98e 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -72,8 +72,8 @@ module API end params :merge_requests_params do - optional :state, type: String, values: %w[opened closed merged all], default: 'all', - desc: 'Return opened, closed, merged, or all merge requests' + optional :state, type: String, values: %w[opened closed locked merged all], default: 'all', + desc: 'Return opened, closed, locked, merged, or all merge requests' optional :order_by, type: String, values: %w[created_at updated_at], default: 'created_at', desc: 'Return merge requests ordered by `created_at` or `updated_at` fields.' optional :sort, type: String, values: %w[asc desc], default: 'desc', |