diff options
| author | Ralf Seidler <ralf.seidler@uni-jena.de> | 2014-09-06 11:46:14 +0200 |
|---|---|---|
| committer | Ralf Seidler <ralf.seidler@uni-jena.de> | 2014-09-06 11:46:14 +0200 |
| commit | 23241c181c0becdff17365aa49f80c05210f8b16 (patch) | |
| tree | b5cf97191951d98ca5c5f055525b4ce7654d0dc9 | |
| parent | d93b046c4c7adf5a8fe37122864d7b1fabbd5bf6 (diff) | |
| download | gitlab-ce-23241c181c0becdff17365aa49f80c05210f8b16.tar.gz | |
Fixed houndci complaining over too long lines
| -rw-r--r-- | app/controllers/search_controller.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/project_search_results.rb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 121307ae1f7..95eac66784d 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -9,7 +9,8 @@ class SearchController < ApplicationController @search_results = if @project return access_denied! unless can?(current_user, :download_code, @project) - unless %w(blobs notes issues merge_requests wiki_blobs).include?(@scope) + unless %w(blobs notes issues merge_requests wiki_blobs). + include?(@scope) @scope = 'blobs' end diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 5d959dfe0a5..736c22ecc77 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -22,7 +22,8 @@ module Gitlab end def total_count - @total_count ||= issues_count + merge_requests_count + blobs_count + notes_count + wiki_blobs_count + @total_count ||= issues_count + merge_requests_count + blobs_count + + notes_count + wiki_blobs_count end def blobs_count @@ -51,7 +52,8 @@ module Gitlab if !project.wiki_enabled? [] else - Repository.new(ProjectWiki.new(project).path_with_namespace).search_files(query) + Repository.new(ProjectWiki.new(project).path_with_namespace). + search_files(query) end end |