summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-03 11:28:56 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-03 11:28:56 +0100
commitfb2f8be4d7cddc01471b58334c33ecdee4d0b887 (patch)
treef129d9906fb8c1ef11eec09ad182d0a042102f09 /app/controllers
parentd0e74f49b47e83ebde89be163a9344a0bae14626 (diff)
parent28f6fba97cb9753c43d109ef4f43439413d4eb69 (diff)
downloadgitlab-ce-fb2f8be4d7cddc01471b58334c33ecdee4d0b887.tar.gz
Merge branch 'olhado/gitlab-ce-commit-search'
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/search_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eb0408a95e5..9bb42ec86b3 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -23,8 +23,8 @@ class SearchController < ApplicationController
@search_results =
if @project
- unless %w(blobs notes issues merge_requests milestones wiki_blobs).
- include?(@scope)
+ unless %w(blobs notes issues merge_requests milestones wiki_blobs
+ commits).include?(@scope)
@scope = 'blobs'
end