diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 15:01:02 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 15:01:02 +0300 |
| commit | 424b42d6e9a988c7c0384ac49bf0ca6a344febc1 (patch) | |
| tree | 4716e353aaefc6aada682ca792b53734ed378e68 /lib/gitlab/project_search_results.rb | |
| parent | 4b65b0e0f5804492e90c3ee8037739c47bcc354b (diff) | |
| download | gitlab-ce-424b42d6e9a988c7c0384ac49bf0ca6a344febc1.tar.gz | |
Fix 500 error on empty search in project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab/project_search_results.rb')
| -rw-r--r-- | lib/gitlab/project_search_results.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index e5a04c3d9cf..8b85f3da83f 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -45,7 +45,7 @@ module Gitlab private def blobs - if project.empty_repo? + if project.empty_repo? || query.blank? [] else project.repository.search_files(query, repository_ref) @@ -53,7 +53,7 @@ module Gitlab end def wiki_blobs - if project.wiki_enabled? + if project.wiki_enabled? && query.present? project_wiki = ProjectWiki.new(project) unless project_wiki.empty? |