Fixing bug with wiki ref in ProjectSearchResults

1 files changed, 12 insertions, 7 deletions

diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 38bdc61d8ab..62f9e538c04 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -5,7 +5,7 @@ module Gitlab
     def initialize(current_user, project, query, repository_ref = nil, per_page: 20)
       @current_user = current_user
       @project = project
-      @repository_ref = repository_ref.presence || project.default_branch
+      @repository_ref = repository_ref.presence
       @query = query
       @per_page = per_page
     end
@@ -95,7 +95,7 @@ module Gitlab
     def blobs
       return [] unless Ability.allowed?(@current_user, :download_code, @project)
 
-      @blobs ||= Gitlab::FileFinder.new(project, repository_ref).find(query)
+      @blobs ||= Gitlab::FileFinder.new(project, repository_project_ref).find(query)
     end
 
     def wiki_blobs
@@ -103,11 +103,8 @@ module Gitlab
 
       @wiki_blobs ||= begin
         if project.wiki_enabled? && query.present?
-          project_wiki = ProjectWiki.new(project)
-
-          unless project_wiki.empty?
-            ref = repository_ref || project.wiki.default_branch
-            Gitlab::WikiFileFinder.new(project, ref).find(query)
+          unless project.wiki.empty?
+            Gitlab::WikiFileFinder.new(project, repository_wiki_ref).find(query)
           else
             []
           end
@@ -150,5 +147,13 @@ module Gitlab
     def project_ids_relation
       project
     end
+
+    def repository_project_ref
+      @repository_project_ref ||= repository_ref || project.default_branch
+    end
+
+    def repository_wiki_ref
+      @repository_wiki_ref ||= repository_ref || project.wiki.default_branch
+    end
   end
 end