summaryrefslogtreecommitdiff
path: root/app/controllers/search_controller.rb
diff options
context:
space:
mode:
authorJonathan Schoeffling <jonathan.schoeffling@lmco.com>2015-06-14 18:04:20 -0400
committerMichael Chmielewski <code@mikec.123mail.org>2015-10-28 22:34:39 -0400
commit5a5069969ce8e9184e36abbb7623bf474d5869e9 (patch)
treead20f6d4f79b67a26a6237e95e37b1af42517970 /app/controllers/search_controller.rb
parent8c9e1df98eb45e3305ab5badc6727580e84d36e0 (diff)
downloadgitlab-ce-5a5069969ce8e9184e36abbb7623bf474d5869e9.tar.gz
Add support for searching commit log messages
Include the log messages of recent commits in project-level search results, providing functionality similar to 'git log --grep'. Update repository model rspec tests to validate the output of Repository#commits_with_log_matching.
Diffstat (limited to 'app/controllers/search_controller.rb')
-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