summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorMark Fletcher <mark@gitlab.com>2017-12-19 21:57:46 +0000
committerMark Fletcher <mark@gitlab.com>2017-12-20 07:23:57 +0000
commitc9732b3c6dc07b4ffd0df9c2ae88e1f67cd56243 (patch)
tree4c81736ce6e063a4db62167338174d1bd3b58737 /lib/api
parent5b880f0d36b082a0b443c5fe95f51a84dee27475 (diff)
downloadgitlab-ce-c9732b3c6dc07b4ffd0df9c2ae88e1f67cd56243.tar.gz
Employ declared_params in finder methods for MR and Issue API lists
- Ensure that unwanted params are no passed to actual finder classes
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/issues.rb2
-rw-r--r--lib/api/merge_requests.rb2
2 files changed, 2 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..c95e28edbef 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)