diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2019-01-14 01:24:31 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2019-01-14 12:02:55 +0900 |
| commit | d32aec06fe2d6ee0b2b0c0d1ca8cfd9bab14e4e7 (patch) | |
| tree | 6449d068a342509222709755177034c672f58236 /lib | |
| parent | 1161c99e5c5a6e717127b83665de00068d810e0e (diff) | |
| download | gitlab-ce-d32aec06fe2d6ee0b2b0c0d1ca8cfd9bab14e4e7.tar.gz | |
Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API
Diffstat (limited to 'lib')
| -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 dac700482b4..a797f01e89f 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 joined 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 8c1951cc535..991b7310cfd 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 joined them with comma' optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title' use :pagination end |