Added wiki-page search for 5-2-stable, Fixed issue #4310

app/contexts/search_context.rb

@@ -21,7 +21,15 @@ class SearchContext
     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)
-      result[:wiki_pages] = []
+      projects.each do |p|
+        wiki = GollumWiki.new(p)
+#        Rails.logger.info wiki
+        t=wiki.search_i(query)
+#        Rails.logger.info t[0][:wiki].path
+        result[:wiki_pages] += t
+      end
+
+      #result[:wiki_pages] = [] #GollumWiki.where(project_id: project_ids).wiki.search(query)
     end
     result
   end

app/models/gollum_wiki.rb

-class GollumWiki
+class GollumWiki 
   MARKUPS = {
     "Markdown" => :markdown,
@@ -11,6 +11,9 @@ class GollumWiki
   # an operation fails.
   attr_reader :error_message
+  attr_reader :search_i
+  attr_reader :project
+
   def initialize(project, user = nil)
     @project = project
     @user = user
@@ -32,6 +35,10 @@ class GollumWiki
     url_to_repo
   end
+  def project_id
+    @project.project_id
+  end
+
   def http_url_to_repo
     http_url = [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('')
   end
@@ -44,6 +51,15 @@ class GollumWiki
       create_repo!
     end
   end
+ 
+  def search_i(query)
+     i=[]
+     wiki.search(query).each do |q|
+       i.push(find_page(q[:name]))
+       Rails.logger.info "Accessing:" + find_page(q[:name])[:wiki].path
+     end
+     @search_i=i
+  end
   # Returns an Array of Gitlab WikiPage instances or an
   # empty Array if this Wiki has no pages.
@@ -109,6 +125,10 @@ class GollumWiki
     "#{@user.username} #{action} page: #{title}"
   end
+  def search_wiki(query)
+    wiki.search(query)
+  end
+
   def gitlab_shell
     @gitlab_shell ||= Gitlab::Shell.new
   end

app/views/search/_result.html.haml

@@ -38,10 +38,10 @@
     - @wiki_pages.each do |wiki_page|
       %li
         wiki:
-        = link_to project_wiki_path(wiki_page.project, wiki_page) do
+        = link_to project_wiki_path(wiki_page.wiki.project.path_with_namespace, wiki_page) do
           %strong.term
             = truncate wiki_page.title, length: 50
-        %span.light (#{wiki_page.project.name_with_namespace})
+        %span.light (#{wiki_page.wiki.path_with_namespace})
     - @blobs.each do |blob|
       = render 'blob', blob: blob