diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 08:47:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 08:47:45 +0000 |
| commit | 8ccf7f328dfadaba6b08c5fdb91f6103c20226f9 (patch) | |
| tree | 92d4552fdd6adbd177067e7e84ff3e45d45b2452 /lib | |
| parent | 439c63365f196badda401be0f8517ec9a561b99a (diff) | |
| parent | d17d3ec7f7d25af9091125bf6eac87ab1d30f938 (diff) | |
| download | gitlab-ce-8ccf7f328dfadaba6b08c5fdb91f6103c20226f9.tar.gz | |
Merge branch '44280-fix-code-search' into 'master'
Resolve "Search code blob sometimes shows filename and branch"
Closes #44280
See merge request gitlab-org/gitlab-ce!17777
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/project_search_results.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 9811c447a01..208710b0935 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1390,7 +1390,7 @@ module Gitlab offset = 2 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(/^--$/) + run_git(args).first.scrub.split(/^--\n/) end def can_be_merged?(source_sha, target_branch) diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 29277ec6481..390efda326a 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -58,7 +58,7 @@ module Gitlab data = "" startline = 0 - result.strip.each_line.each_with_index do |line, index| + result.each_line.each_with_index do |line, index| prefix ||= line.match(/^(?<ref>[^:]*):(?<filename>.*)\x00(?<startline>\d+)\x00/)&.tap do |matches| ref = matches[:ref] filename = matches[:filename] |