summaryrefslogtreecommitdiff
path: root/lib/api/merge_requests.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-02-05 09:52:40 +0000
committerSean McGivern <sean@gitlab.com>2019-02-05 09:52:40 +0000
commit068b41275f6f142acfddca273ace68d03a6c0730 (patch)
treec3f4c927ede7a09242f16771481a0cb7f627fc91 /lib/api/merge_requests.rb
parenta34d6abd3b2ee98b0a68b4571c7de61321b4a3ce (diff)
parent40198f81843b315f2eb1c1a1a65292b6fc61f9d7 (diff)
downloadgitlab-ce-068b41275f6f142acfddca273ace68d03a6c0730.tar.gz
Merge branch 'search-title' into 'master'
Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API See merge request gitlab-org/gitlab-ce!24350
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r--lib/api/merge_requests.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 132b19164d0..4179aaa93a0 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -109,7 +109,8 @@ module API
optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
optional :source_branch, type: String, desc: 'Return merge requests with the given source branch'
optional :target_branch, type: String, desc: 'Return merge requests with the given target branch'
- optional :search, type: String, desc: 'Search merge requests for text present in the title or description'
+ 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 :pagination
end