diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-09 16:50:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-09 16:50:43 +0300 |
| commit | 0e78d00bcb8fd0214fb6c592c7b2814f7a70cd42 (patch) | |
| tree | 0ea5b75d650fc92b82c9da193c5ce8d9e2d98ddd /app/controllers/search_controller.rb | |
| parent | 04cf074552a047c1b50c54d38a1fd18c7b64c784 (diff) | |
| parent | 9edf6d4dd08d3bd74df22645a919dbf26d22faf7 (diff) | |
| download | gitlab-ce-0e78d00bcb8fd0214fb6c592c7b2814f7a70cd42.tar.gz | |
Merge pull request #7695 from coverer/search_wiki
Added search wiki feature
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 58ec8e75d7a..55926a1ed22 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -10,7 +10,8 @@ class SearchController < ApplicationController @search_results = if @project return access_denied! unless can?(current_user, :download_code, @project) - unless %w(blobs notes issues merge_requests).include?(@scope) + unless %w(blobs notes issues merge_requests wiki_blobs). + include?(@scope) @scope = 'blobs' end |