7 files changed, 48 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 73567e11802..671b41b26e2 100644
--- a/CHANGELOG
+++ b/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
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index a3bc64c010e..f8a96516e61 100644
--- a/app/helpers/wiki_helper.rb
+++ b/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
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 96755707dee..3e660cfba1e 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -36,4 +36,9 @@ In GitLab Admin section, navigate to `Service Templates` and choose the service
 
 After the template is created, the template details will be pre-filled on the project service page.
 
+NOTE: For each project, you will still need to configure the issue tracking URLs by replacing `:issues_tracker_id` in the above screenshot
+with the ID used by your external issue tracker. Prior to GitLab v7.8, this ID was configured in the project settings, and GitLab would automatically
+update the URL configured in `gitlab.yml`. This behavior is now depecated, and all issue tracker URLs must be configured directly
+within the project's Services settings.
+
 Support to add your commits to the Jira ticket automatically is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jira.html).
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 80b01ca4043..4fbd20762da 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -47,3 +47,12 @@ sudo gitlab-rake gitlab:import:all_users_to_all_groups
 # installation from source
 bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production
 ```
+
+## Maintain tight control over the number of active users on your GitLab installation
+
+- Enable this setting to keep new users blocked until they have been cleared by the admin (default: false).
+
+
+```
+block_auto_created_users: false
+```
diff --git a/features/search.feature b/features/search.feature
index def21e00923..1608e824671 100644
--- a/features/search.feature
+++ b/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
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
index bb93e582a1f..717132da45d 100644
--- a/features/steps/project/wiki.rb
+++ b/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
diff --git a/features/steps/search.rb b/features/steps/search.rb
index 6f0e038c4d6..8197cd410aa 100644
--- a/features/steps/search.rb
+++ b/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