diff options
Diffstat (limited to 'app/finders/merge_requests_finder.rb')
-rw-r--r-- | app/finders/merge_requests_finder.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb index ba709d3bdfc..81e4ab7014d 100644 --- a/app/finders/merge_requests_finder.rb +++ b/app/finders/merge_requests_finder.rb @@ -140,14 +140,13 @@ class MergeRequestsFinder < IssuableFinder # rubocop: disable CodeReuse/ActiveRecord def by_draft(items) - draft_param = params[:draft] || params[:wip] + draft_param = Gitlab::Utils.to_boolean(params.fetch(:draft) { params.fetch(:wip, nil) }) + return items if draft_param.nil? - if draft_param == 'yes' + if draft_param items.where(wip_match(items.arel_table)) - elsif draft_param == 'no' - items.where.not(wip_match(items.arel_table)) else - items + items.where.not(wip_match(items.arel_table)) end end # rubocop: enable CodeReuse/ActiveRecord |