Fix paginate of blobs, fixed preserve in dev mode for blob results

4 files changed, 6 insertions, 12 deletions

diff --git a/app/contexts/search_context.rb b/app/contexts/search_context.rb
index 1f28c7f9c4a..22cda709f69 100644
--- a/app/contexts/search_context.rb
+++ b/app/contexts/search_context.rb
@@ -17,14 +17,7 @@ class SearchContext
     project = projects.first if projects.length == 1
 
     if params[:search_code].present?
-      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
+      result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
     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)
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 0a92d647a13..f5c3bb133ed 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -20,6 +20,7 @@ class SearchController < ApplicationController
     @merge_requests = result[:merge_requests]
     @issues         = result[:issues]
     @wiki_pages     = result[:wiki_pages]
-    @blobs          = result[:blobs]
+    @blobs          = Kaminari.paginate_array(result[:blobs]).page(params[:page]).per(20)
+    @total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count
   end
 end
diff --git a/app/views/search/_blob.html.haml b/app/views/search/_blob.html.haml
index 39e71170706..8b5efa8f622 100644
--- a/app/views/search/_blob.html.haml
+++ b/app/views/search/_blob.html.haml
@@ -7,4 +7,5 @@
           = blob.filename
     .file_content.code.term
       %div{class: user_color_scheme_class}
-        = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
+        = preserve do
+          = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
diff --git a/app/views/search/_result.html.haml b/app/views/search/_result.html.haml
index 23f6646fba2..4d8caa5e70c 100644
--- a/app/views/search/_result.html.haml
+++ b/app/views/search/_result.html.haml
@@ -1,7 +1,7 @@
 %fieldset
   %legend
     Search results
-    %span.cgray (#{@projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count})
+    %span.cgray (#{@total_results})
 
 - if @project
   %ul.nav.nav-pills
@@ -12,7 +12,6 @@
       = link_to search_path(params.merge(search_code: nil)) do
         Everything else
 
-
 .search_results
   %ul.bordered-list
     - @projects.each do |project|