Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-07-28 02:27:15 +0400
committerRobert Schilling <rschilling@student.tugraz.at>2014-08-11 13:31:37 +0400
commitda7e14c864eb039ffe1c06409681721892917b71 (patch)
treeadcc5ac17ffeb26c17527164ebe56bfb33ffa05c /app/services/search
parent9d3e384ae6553fee85b7a1ed2b99a18a9884606e (diff)
fix searching on empty project, prevent 500
Fix hound
Diffstat (limited to 'app/services/search')
-rw-r--r--app/services/search/project_service.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/search/project_service.rb b/app/services/search/project_service.rb
index 493dee95f90..8aac18840e4 100644
--- a/app/services/search/project_service.rb
+++ b/app/services/search/project_service.rb
@@ -12,7 +12,13 @@ module Search
return result unless query.present?
if params[:search_code].present?
- blobs = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
+ if !@project.empty_repo?
+ blobs = project.repository.search_files(query,
+ params[:repository_ref])
+ else
+ blobs = Array.new
+ end
+
blobs = Kaminari.paginate_array(blobs).page(params[:page]).per(20)
result[:blobs] = blobs
result[:total_results] = blobs.total_count