Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 10 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 68f199cc160..3e61b3c7f3b 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -90,18 +90,22 @@ module API
       def present_projects(projects, options = {})
         projects = reorder_projects(projects)
         projects = apply_filters(projects)
-        projects = paginate(projects)
-        projects, options = with_custom_attributes(projects, options)
 
-        options = options.reverse_merge(
-          with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
-          statistics: params[:statistics],
-          current_user: current_user,
-          license: false
-        )
-        options[:with] = Entities::BasicProjectDetails if params[:simple]
+        records, options = paginate_with_strategies(projects) do |projects|
+          projects, options = with_custom_attributes(projects, options)
+
+          options = options.reverse_merge(
+            with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
+            statistics: params[:statistics],
+            current_user: current_user,
+            license: false
+          )
+          options[:with] = Entities::BasicProjectDetails if params[:simple]
+
+          [options[:with].prepare_relation(projects, options), options]
+        end
 
-        present options[:with].prepare_relation(projects, options), options
+        present records, options
       end
 
       def translate_params_for_compatibility(params)