summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-04 16:45:31 +0000
committerRémy Coutable <remy@rymai.me>2017-04-04 16:45:31 +0000
commit93de37ce1bd0f5ce015287f0729d625ddf6f7390 (patch)
treef5002aaa70141bb3e84c344f599e50031a19aa1d /app
parent93e36d56e0d494b5c334603f0072f4a085edaa33 (diff)
parentd663b8de246a4307a283b464ab4b5344463d30c3 (diff)
downloadgitlab-ce-93de37ce1bd0f5ce015287f0729d625ddf6f7390.tar.gz
Merge branch 'bug/api_milestone_merge_requests_scope' into 'master'
Fixes milestone/merge_request API endpoint to really scope the results See merge request !10369
Diffstat (limited to 'app')
-rw-r--r--app/finders/issues_finder.rb2
-rw-r--r--app/finders/merge_requests_finder.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index 08713272947..76715e5970d 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -9,7 +9,7 @@
# state: 'open' or 'closed' or 'all'
# group_id: integer
# project_id: integer
-# milestone_id: integer
+# milestone_title: string
# assignee_id: integer
# search: string
# label_name: string
diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb
index 1eec45d9cb5..42f0ebd774c 100644
--- a/app/finders/merge_requests_finder.rb
+++ b/app/finders/merge_requests_finder.rb
@@ -9,7 +9,7 @@
# state: 'open' or 'closed' or 'all'
# group_id: integer
# project_id: integer
-# milestone_id: integer
+# milestone_title: string
# assignee_id: integer
# search: string
# label_name: string