Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -6,6 +6,7 @@ v 7.11.0 (unreleased)
   - Don't allow a merge request to be merged when its title starts with "WIP".
   - Add a page title to every page.
   - Allow primary email to be set to an email that you've already added.
+  - Fix Error 500 when searching Wiki pages (Stan Hu)
   - Get Gitorious importer to work again.
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules

app/helpers/wiki_helper.rb

@@ -6,6 +6,8 @@ module WikiHelper
         case wiki_page
         when Symbol
           wiki_page
+        when String
+          wiki_page
         else
           wiki_page.slug
         end

features/search.feature

@@ -44,3 +44,9 @@ Feature: Search
     Then I should see "Foo" link in the search results
     And I should not see "Bar" link in the search results
 
+  Scenario: I should see Wiki blobs
+    And project has Wiki content
+    When I click project "Shop" link
+    And I search for "Wiki content"
+    And I click "Wiki" link
+    Then I should see "test_wiki" link in the search results

features/steps/project/wiki.rb

@@ -159,6 +159,11 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     page.should have_content('History for')
   end
 
+  step 'I search for Wiki content' do
+    fill_in "Search in this project", with: "wiki_content"
+    click_button "Search"
+  end
+
   def wiki
     @project_wiki = ProjectWiki.new(project, current_user)
   end

features/steps/search.rb

@@ -18,6 +18,11 @@ class Spinach::Features::Search < Spinach::FeatureSteps
     click_button "Search"
   end
 
+  step 'I search for "Wiki content"' do
+    fill_in "dashboard_search", with: "content"
+    click_button "Search"
+  end
+
   step 'I click "Issues" link' do
     within '.search-filter' do
       click_link 'Issues'
@@ -36,6 +41,12 @@ class Spinach::Features::Search < Spinach::FeatureSteps
     end
   end
 
+  step 'I click "Wiki" link' do
+    within '.search-filter' do
+      click_link 'Wiki'
+    end
+  end
+
   step 'I should see "Shop" project link' do
     page.should have_link "Shop"
   end
@@ -66,4 +77,13 @@ class Spinach::Features::Search < Spinach::FeatureSteps
   step 'I should not see "Bar" link in the search results' do
     find(:css, '.search-results').should_not have_link 'Bar'
   end
+
+  step 'I should see "test_wiki" link in the search results' do
+    find(:css, '.search-results').should have_link 'test_wiki.md'
+  end
+
+  step 'project has Wiki content' do
+    @wiki = ::ProjectWiki.new(project, current_user)
+    @wiki.create_page("test_wiki", "Some Wiki content", :markdown, "first commit")
+  end
 end