summaryrefslogtreecommitdiff
path: root/lib/gitlab/snippet_search_results.rb
diff options
context:
space:
mode:
authorCharles Bushong <bushong1@gmail.com>2014-09-02 08:33:23 -0400
committerCharles Bushong <bushong1@gmail.com>2014-09-02 08:33:23 -0400
commitb1411e90f81ea87ad45dee324b13881095e031ea (patch)
tree945e1ae1af44927b900a50d3c99eee8ad8efcbf4 /lib/gitlab/snippet_search_results.rb
parent4cca1b050a0e80e4ce6bb67f530549a2f28af630 (diff)
downloadgitlab-ce-b1411e90f81ea87ad45dee324b13881095e031ea.tar.gz
Changing some formatting for the Hound, modifying some UI text
Diffstat (limited to 'lib/gitlab/snippet_search_results.rb')
-rw-r--r--lib/gitlab/snippet_search_results.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 4b406c30f47..04217aab49f 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -37,10 +37,10 @@ module Gitlab
end
def snippet_blobs
- matching_snippets = Snippet.where(id: limit_snippet_ids).search_code(query).order('updated_at DESC')
- matching_snippets = matching_snippets.to_a
+ search = Snippet.where(id: limit_snippet_ids).search_code(query)
+ search = search.order('updated_at DESC').to_a
snippets = []
- matching_snippets.each { |e| snippets << chunk_snippet(e) }
+ search.each { |e| snippets << chunk_snippet(e) }
snippets
end
@@ -58,14 +58,14 @@ module Gitlab
surrounding_lines = 3
used_lines = []
lined_content = snippet.content.split("\n")
- lined_content.each_with_index { |line, line_number|
+ lined_content.each_with_index do |line, line_number|
used_lines.concat bounded_line_numbers(
line_number,
0,
lined_content.size,
surrounding_lines
) if line.include?(query)
- }
+ end
used_lines = used_lines.uniq.sort
@@ -73,7 +73,7 @@ module Gitlab
snippet_chunks = []
snippet_start_line = 0
last_line = -1
- used_lines.each { |line_number|
+ used_lines.each do |line_number|
if last_line < 0
snippet_start_line = line_number
snippet_chunk << lined_content[line_number]
@@ -88,7 +88,7 @@ module Gitlab
snippet_start_line = line_number
end
last_line = line_number
- }
+ end
snippet_chunks << {
data: snippet_chunk.join("\n"),
start_line: snippet_start_line + 1