diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-05 12:52:40 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-05 12:52:40 +0300 |
| commit | 068b41275f6f142acfddca273ace68d03a6c0730 (patch) | |
| tree | c3f4c927ede7a09242f16771481a0cb7f627fc91 /lib/api | |
| parent | a34d6abd3b2ee98b0a68b4571c7de61321b4a3ce (diff) | |
| parent | 40198f81843b315f2eb1c1a1a65292b6fc61f9d7 (diff) | |
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')
| -rw-r--r-- | lib/api/issues.rb | 3 | ||||
| -rw-r--r-- | lib/api/merge_requests.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index afa3ac80121..b3636c98550 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -43,7 +43,8 @@ module API desc: 'Return issues sorted in `asc` or `desc` order.' optional :milestone, type: String, desc: 'Return issues for a specific milestone' optional :iids, type: Array[Integer], desc: 'The IID array of issues' - optional :search, type: String, desc: 'Search issues for text present in the title or description' + optional :search, type: String, desc: 'Search issues 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 :created_after, type: DateTime, desc: 'Return issues created after the specified time' optional :created_before, type: DateTime, desc: 'Return issues created before the specified time' optional :updated_after, type: DateTime, desc: 'Return issues updated after the specified time' 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 |