diff options
| author | Chantal Rollison <crollison@gitlab.com> | 2018-06-26 12:30:29 -0700 |
|---|---|---|
| committer | Chantal Rollison <crollison@gitlab.com> | 2018-06-28 07:12:00 -0700 |
| commit | c2b622b2a40bdf01f3f71a8adf9aff31d535149f (patch) | |
| tree | 2201c82f393361c18a7b1894143988124b3f4089 /lib/api/merge_requests.rb | |
| parent | f63e234b57e07e2020f9698f48c9515905d4b6a3 (diff) | |
| download | gitlab-ce-c2b622b2a40bdf01f3f71a8adf9aff31d535149f.tar.gz | |
Add locked state to merge request API
Diffstat (limited to 'lib/api/merge_requests.rb')
| -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', |