diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:24:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:24:36 +0000 |
| commit | a7d172625a8a8f31eb7730a343951c0de2436da0 (patch) | |
| tree | 455d0fbe1c7d323540aefb8d9bbddea7b9d32dc5 /app/models/repository.rb | |
| parent | 093856a75ed4a354286f7e6fc7a0f08d9d95a431 (diff) | |
| parent | 91939161aace35823f7a60b25647d5e23285c556 (diff) | |
| download | gitlab-ce-a7d172625a8a8f31eb7730a343951c0de2436da0.tar.gz | |
Merge branch '41666-cannot-search-with-keyword-merge' into 'master'
Resolve "Cannot search with keyword "merge""
Closes #41666
See merge request gitlab-org/gitlab-ce!16462
Diffstat (limited to 'app/models/repository.rb')
| -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 a67bb7294e6..b4bc0f87458 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -932,7 +932,7 @@ class Repository return [] if empty? || query.blank? offset = 2 - args = %W(grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref}) + args = %W(grep -i -I -n -z --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref}) run_git(args).first.scrub.split(/^--$/) end |