summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-14 12:20:48 +0200
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-16 11:30:26 +0200
commitac44e3844deac1c13f35ca0e9a7ce995be58aab7 (patch)
tree650c6f3ae6070ae7021a2ac133063feb2d4e1faa
parentb5762104abbf373d69a20532de08564eb9ae93f6 (diff)
downloadgitlab-ce-ac44e3844deac1c13f35ca0e9a7ce995be58aab7.tar.gz
Add project scope to milestone search
-rw-r--r--app/finders/issuable_finder.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 97c7e74c294..d60f36e1aff 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -81,7 +81,14 @@ class IssuableFinder
@milestones =
if milestones?
- Milestone.where(title: params[:milestone_title])
+ scope =
+ if project
+ project.milestones
+ else
+ Milestone.all
+ end
+
+ scope.where(title: params[:milestone_title])
else
nil
end