summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-06 16:59:45 +0000
committerRémy Coutable <remy@rymai.me>2018-12-06 16:59:45 +0000
commit69b2a78826c2921e2ba80a769f1deac78bafe38c (patch)
treee1e39380a81d2d557aac4135dcf0343f7592ac4a /lib/api
parent1e6b82a575d5f9a2dc3b69d74bf4dd06357939b7 (diff)
parent58bfd733310effa94af0e1f1f19e53e34235cffc (diff)
downloadgitlab-ce-69b2a78826c2921e2ba80a769f1deac78bafe38c.tar.gz
Merge branch 'blob-count2' into 'master'
Support unlimited file search in web UI and API See merge request gitlab-org/gitlab-ce!23553
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/search.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/api/search.rb b/lib/api/search.rb
index 5900e1cccc2..f5db692afe5 100644
--- a/lib/api/search.rb
+++ b/lib/api/search.rb
@@ -35,12 +35,7 @@ module API
end
def process_results(results)
- case params[:scope]
- when 'blobs', 'wiki_blobs'
- paginate(results).map { |blob| blob[1] }
- else
- paginate(results)
- end
+ paginate(results)
end
def snippets?