Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 4 insertions, 30 deletions

diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index e955ccd35da..9911f9e62a6 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -11,36 +11,18 @@ module Gitlab
       @query = query
     end
 
-    def objects(scope, page = nil)
-      case scope
-      when 'snippet_titles'
-        paginated_objects(snippet_titles, page)
-      when 'snippet_blobs'
-        paginated_objects(snippet_blobs, page)
-      else
-        super(scope, nil, false)
-      end
+    def objects(scope, page: nil, per_page: DEFAULT_PER_PAGE)
+      paginated_objects(snippet_titles, page, per_page)
     end
 
     def formatted_count(scope)
-      case scope
-      when 'snippet_titles'
-        formatted_limited_count(limited_snippet_titles_count)
-      when 'snippet_blobs'
-        formatted_limited_count(limited_snippet_blobs_count)
-      else
-        super
-      end
+      formatted_limited_count(limited_snippet_titles_count)
     end
 
     def limited_snippet_titles_count
       @limited_snippet_titles_count ||= limited_count(snippet_titles)
     end
 
-    def limited_snippet_blobs_count
-      @limited_snippet_blobs_count ||= limited_count(snippet_blobs)
-    end
-
     private
 
     # rubocop: disable CodeReuse/ActiveRecord
@@ -56,15 +38,7 @@ module Gitlab
       snippets.search(query)
     end
 
-    def snippet_blobs
-      snippets.search_code(query)
-    end
-
-    def default_scope
-      'snippet_blobs'
-    end
-
-    def paginated_objects(relation, page)
+    def paginated_objects(relation, page, per_page)
       relation.page(page).per(per_page)
     end