Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-02-05 19:20:29 +0300
committerValery Sizov <valery@gitlab.com>2016-02-05 19:20:29 +0300
commit94af78ac4a7a0b76eb370a22320ee6410b6a4695 (patch)
tree6ff098bccfa2bbbbc2063287ca4cf8c0e316ed68 /lib/gitlab/snippet_search_results.rb
parent569c4672033701c0cf89c9fc8f031507c5f7af6c (diff)
Faster snippet search
Diffstat (limited to 'lib/gitlab/snippet_search_results.rb')
-rw-r--r--lib/gitlab/snippet_search_results.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 38364a0b151..cadb010ef03 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -14,7 +14,7 @@ module Gitlab
when 'snippet_titles'
Kaminari.paginate_array(snippet_titles).page(page).per(per_page)
when 'snippet_blobs'
- Kaminari.paginate_array(snippet_blobs).page(page).per(per_page)
+ snippet_blobs.page(page).per(per_page)
else
super
end
@@ -39,11 +39,7 @@ module Gitlab
end
def snippet_blobs
- search = Snippet.where(id: limit_snippet_ids).search_code(query)
- search = search.order('updated_at DESC').to_a
- snippets = []
- search.each { |e| snippets << chunk_snippet(e) }
- snippets
+ Snippet.where(id: limit_snippet_ids).search_code(query).order('updated_at DESC')
end
def default_scope