diff options
author | Rémy Coutable <remy@rymai.me> | 2017-12-20 16:59:39 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-12-20 16:59:39 +0300 |
commit | 7429a1f18c2148f00b4675687a0ad89b4db6eec6 (patch) | |
tree | aca5fc0e8fb4c25f75f6a02cae3cfd27467d6241 /lib | |
parent | cc8ff768d712cabf7311802cec026654f005b88b (diff) | |
parent | 055543b915c13df57e13629cd49ca9d63b6e3e76 (diff) |
Merge branch '38318-search-merge-requests-with-api' into 'master'
Resolve "Search merge-requests with API"
Closes #38318
See merge request gitlab-org/gitlab-ce!16029
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/issues.rb | 2 | ||||
-rw-r--r-- | lib/api/merge_requests.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 5f943ba27d1..b29c5848aef 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -8,7 +8,7 @@ module API helpers do def find_issues(args = {}) - args = params.merge(args) + args = declared_params.merge(args) args.delete(:id) args[:milestone_title] = args.delete(:milestone) diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index d34886fca2e..02f2b75ab9d 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -8,7 +8,7 @@ module API helpers do def find_merge_requests(args = {}) - args = params.merge(args) + args = declared_params.merge(args) args[:milestone_title] = args.delete(:milestone) args[:label_name] = args.delete(:labels) @@ -41,6 +41,7 @@ module API optional :scope, type: String, values: %w[created-by-me assigned-to-me all], desc: 'Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`' optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji' + optional :search, type: String, desc: 'Search merge requests for text present in the title or description' use :pagination end end |