diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-25 11:55:14 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-25 11:55:14 +0100 |
commit | b6f8d0100e55b8138f53155c35bc0e9b3ebc56af (patch) | |
tree | 23b32aa7b2286a66131d5c4ad5e4d505bf9cf3f9 /app | |
parent | 9b937046144f467649c966a2a1979050cd826f3e (diff) | |
parent | d7bcfe4fc020529f9b6ed2a75dfb2f31acded080 (diff) | |
download | gitlab-ce-b6f8d0100e55b8138f53155c35bc0e9b3ebc56af.tar.gz |
Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'
Diffstat (limited to 'app')
-rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 9d68d8a6dfd..a3ba5f4c18a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -496,7 +496,7 @@ class Repository def search_files(query, ref) offset = 2 - args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref}) + args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} -e #{query} #{ref || root_ref}) Gitlab::Popen.popen(args, path_to_repo).first.scrub.split(/^--$/) end |