summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-11-10 19:27:09 +0200
committerValery Sizov <valery@gitlab.com>2016-11-16 14:25:54 +0200
commita5632e802b72db01c0fb0b8bec77c0fc28b41427 (patch)
tree78a4d3d6fb2ac537e9bc38d0e912275170d9fd3a /app/helpers
parent37abb20cec2a9836a7d1d70a7f7535af6646df1e (diff)
downloadgitlab-ce-a5632e802b72db01c0fb0b8bec77c0fc28b41427.tar.gz
Search for a filename in a project23117-search-for-a-filename-in-a-project
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/search_helper.rb29
1 files changed, 1 insertions, 28 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index aba3a3f9c5d..cdb9663877c 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -31,34 +31,7 @@ module SearchHelper
end
def parse_search_result(result)
- ref = nil
- filename = nil
- basename = nil
- startline = 0
-
- result.each_line.each_with_index do |line, index|
- if line =~ /^.*:.*:\d+:/
- ref, filename, startline = line.split(':')
- startline = startline.to_i - index
- extname = Regexp.escape(File.extname(filename))
- basename = filename.sub(/#{extname}$/, '')
- break
- end
- end
-
- data = ""
-
- result.each_line do |line|
- data << line.sub(ref, '').sub(filename, '').sub(/^:-\d+-/, '').sub(/^::\d+:/, '')
- end
-
- OpenStruct.new(
- filename: filename,
- basename: basename,
- ref: ref,
- startline: startline,
- data: data
- )
+ Gitlab::ProjectSearchResults.parse_search_result(result)
end
private