diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 13:56:23 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 13:56:23 +0300 |
commit | 4b65b0e0f5804492e90c3ee8037739c47bcc354b (patch) | |
tree | 700b172cc1402fd7aeab11eb13f7e6e69ed0276d /lib | |
parent | b13c1469a317a36a72e87fa92972e440fc8438e5 (diff) | |
download | gitlab-ce-4b65b0e0f5804492e90c3ee8037739c47bcc354b.tar.gz |
Fix wikiuse-more-rugged
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/project_search_results.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 9dc8b34d9c7..e5a04c3d9cf 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -4,7 +4,11 @@ module Gitlab def initialize(project_id, query, repository_ref = nil) @project = Project.find(project_id) - @repository_ref = repository_ref + @repository_ref = if repository_ref.present? + repository_ref + else + nil + end @query = Shellwords.shellescape(query) if query.present? end @@ -50,10 +54,10 @@ module Gitlab def wiki_blobs if project.wiki_enabled? - wiki_repo = Repository.new(ProjectWiki.new(project).path_with_namespace) + project_wiki = ProjectWiki.new(project) - if wiki_repo.exists? - wiki_repo.search_files(query) + unless project_wiki.empty? + project_wiki.search_files(query) else [] end |