Merge pull request #1720 from coagulant/wiki_search

Wiki search
2012-11-07 03:51:20 -08:00 · 2012-11-07 03:51:20 -08:00 · 8114d36caf
commit 8114d36caf
parent d6a5e3dad7 e6524a919e
6 changed files with 50 additions and 2 deletions
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@ -5,5 +5,6 @@ class SearchController < ApplicationController
    @projects       = result[:projects]
    @merge_requests = result[:merge_requests]
    @issues         = result[:issues]
+    @wiki_pages     = result[:wiki_pages]
  end
 end