summaryrefslogtreecommitdiff
path: root/lib/api/merge_requests.rb
diff options
context:
space:
mode:
authorIgor <idrozdov@gitlab.com>2019-03-07 07:06:54 +0000
committerMike Greiling <mike@pixelcog.com>2019-03-07 07:06:54 +0000
commit572e3f2254fb9582d304cc4023b83b87dbf0e389 (patch)
tree1d4740d4f580c9b3cac3a37838073d2361951834 /lib/api/merge_requests.rb
parent860a4de34634548d26a0b67b480c3235a181c3d9 (diff)
downloadgitlab-ce-572e3f2254fb9582d304cc4023b83b87dbf0e389.tar.gz
Provide EE backports for filtering by approver feature
Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r--lib/api/merge_requests.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index b2a2aa8837d..6518ebbcff5 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -12,6 +12,9 @@ module API
helpers do
params :optional_params_ee do
end
+
+ params :optional_merge_requests_search_params do
+ end
end
def self.update_params_at_least_one_of
@@ -112,6 +115,8 @@ module API
optional :search, type: String, desc: 'Search merge requests for text present in the title, description, or any combination of these'
optional :in, type: String, desc: '`title`, `description`, or a string joining them with comma'
optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title'
+
+ use :optional_merge_requests_search_params
use :pagination
end
end