diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-24 12:53:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-24 12:53:39 +0000 |
| commit | add099b024cc4155a5be494fdb9ae339fd073a14 (patch) | |
| tree | 0ee484fe1bb0dbdae4333e30ad7c3c36251c1bcf /app/controllers | |
| parent | 24b282aeeaf5ba41c6b73100051eb48428787770 (diff) | |
| parent | 56527b63e8a09e0fe4967eabf08638d853e6b2b5 (diff) | |
| download | gitlab-ce-add099b024cc4155a5be494fdb9ae339fd073a14.tar.gz | |
Merge branch 'milestone_search' into 'master'
Ability to search milestones
https://dev.gitlab.org/gitlab/gitlabhq/issues/2473
See merge request !1158
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/search_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 4e2ea6c5710..eb0408a95e5 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -23,7 +23,7 @@ class SearchController < ApplicationController @search_results = if @project - unless %w(blobs notes issues merge_requests wiki_blobs). + unless %w(blobs notes issues merge_requests milestones wiki_blobs). include?(@scope) @scope = 'blobs' end @@ -36,7 +36,7 @@ class SearchController < ApplicationController Search::SnippetService.new(current_user, params).execute else - unless %w(projects issues merge_requests).include?(@scope) + unless %w(projects issues merge_requests milestones).include?(@scope) @scope = 'projects' end Search::GlobalService.new(current_user, params).execute |