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 /app/finders/issuable_finder.rb | |
| parent | f63e234b57e07e2020f9698f48c9515905d4b6a3 (diff) | |
| download | gitlab-ce-c2b622b2a40bdf01f3f71a8adf9aff31d535149f.tar.gz | |
Add locked state to merge request API
Diffstat (limited to 'app/finders/issuable_finder.rb')
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 5d5f72c4d86..6fdfd964fca 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -7,7 +7,7 @@ # current_user - which user use # params: # scope: 'created_by_me' or 'assigned_to_me' or 'all' -# state: 'opened' or 'closed' or 'all' +# state: 'opened' or 'closed' or 'locked' or 'all' # group_id: integer # project_id: integer # milestone_title: string @@ -311,6 +311,8 @@ class IssuableFinder items.respond_to?(:merged) ? items.merged : items.closed when 'opened' items.opened + when 'locked' + items.where(state: 'locked') else items end |