Search for blobs by default inside project. Added pagination for blobs search

1 files changed, 9 insertions, 2 deletions

diff --git a/app/contexts/search_context.rb b/app/contexts/search_context.rb
index 938429df629..1f28c7f9c4a 100644
--- a/app/contexts/search_context.rb
+++ b/app/contexts/search_context.rb
@@ -14,10 +14,17 @@ class SearchContext
     result[:projects] = projects.search(query).limit(10)
 
     # Search inside singe project
-    result[:project] = project = projects.first if projects.length == 1
+    project = projects.first if projects.length == 1
 
     if params[:search_code].present?
-      result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
+      blobs = []
+
+      unless project.empty_repo?
+        blobs = project.repository.search_files(query, params[:repository_ref])
+        blobs = Kaminari.paginate_array(blobs).page(params[:page]).per(20)
+      end
+
+      result[:blobs] = blobs
     else
       result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
       result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)