kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed houndci complaining over too long lines

This commit is contained in:
Ralf Seidler 2014-09-06 11:46:14 +02:00
parent d93b046c4c
commit 23241c181c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/search_controller.rb
View File

@ -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

6
lib/gitlab/project_search_results.rb
View File

@ -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