summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-09 20:18:19 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-09 20:18:19 +0200
commit5e8c6e6d71afa097296adadd81355af9522f1b2a (patch)
tree1bce4ea44a505d6cc93276bbb59b0ab1874a5c3a
parent356bafcbb4a1702038d1a27ba35203bdcdffd94f (diff)
parent3c5b2a99df5b15709b18e2b80637c7407358156c (diff)
downloadgitlab-ce-5e8c6e6d71afa097296adadd81355af9522f1b2a.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/gitlab/project_search_results.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 581a8c20bdb..0dab7bcfa4d 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