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

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/gitlab/pagination/keyset/request_context.rb b/lib/gitlab/pagination/keyset/request_context.rb
index 8c8138b3076..070fa844347 100644
--- a/lib/gitlab/pagination/keyset/request_context.rb
+++ b/lib/gitlab/pagination/keyset/request_context.rb
@@ -24,7 +24,9 @@ module Gitlab
         end
 
         def apply_headers(next_page)
-          request.header('Links', pagination_links(next_page))
+          link = pagination_links(next_page)
+          request.header('Links', link)
+          request.header('Link', link)
         end
 
         private
diff --git a/lib/gitlab/pagination/offset_pagination.rb b/lib/gitlab/pagination/offset_pagination.rb
index 11a5ef4e518..8796dd4d7ec 100644
--- a/lib/gitlab/pagination/offset_pagination.rb
+++ b/lib/gitlab/pagination/offset_pagination.rb
@@ -19,7 +19,13 @@ module Gitlab
       private
 
       def paginate_with_limit_optimization(relation)
-        pagination_data = relation.page(params[:page]).per(params[:per_page])
+        # do not paginate relation if it is already paginated
+        pagination_data = if relation.respond_to?(:current_page) && relation.current_page == params[:page] && relation.limit_value == params[:per_page]
+                            relation
+                          else
+                            relation.page(params[:page]).per(params[:per_page])
+                          end
+
         return pagination_data unless pagination_data.is_a?(ActiveRecord::Relation)
         return pagination_data unless Feature.enabled?(:api_kaminari_count_with_limit)