Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/pagination/gitaly_keyset_pager.rb b/lib/gitlab/pagination/gitaly_keyset_pager.rb
index 8bbc9a93610..1f1061fe4f1 100644
--- a/lib/gitlab/pagination/gitaly_keyset_pager.rb
+++ b/lib/gitlab/pagination/gitaly_keyset_pager.rb
@@ -12,9 +12,11 @@ module Gitlab
         @project = project
       end
 
-      # It is expected that the given finder will respond to `execute` method with `gitaly_pagination: true` option
+      # It is expected that the given finder will respond to `execute` method with `gitaly_pagination:` option
       # and supports pagination via gitaly.
       def paginate(finder)
+        return finder.execute(gitaly_pagination: false) if no_pagination?
+
         return paginate_via_gitaly(finder) if keyset_pagination_enabled?(finder)
         return paginate_first_page_via_gitaly(finder) if paginate_first_page?(finder)
 
@@ -26,6 +28,10 @@ module Gitlab
 
       private
 
+      def no_pagination?
+        params[:pagination] == 'none'
+      end
+
       def keyset_pagination_enabled?(finder)
         return false unless params[:pagination] == "keyset"