Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 22 insertions, 7 deletions

diff --git a/lib/gitlab/pagination/keyset/order.rb b/lib/gitlab/pagination/keyset/order.rb
index e8e68a5c4a5..e596e1bac9d 100644
--- a/lib/gitlab/pagination/keyset/order.rb
+++ b/lib/gitlab/pagination/keyset/order.rb
@@ -55,14 +55,14 @@ module Gitlab
       #   scope :created_at_ordered, -> {
       #     keyset_order = Gitlab::Pagination::Keyset::Order.build([
       #       Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-      #         attribute: :created_at,
+      #         attribute_name: :created_at,
       #         column_expression: Project.arel_table[:created_at],
       #         order_expression: Project.arel_table[:created_at].asc,
       #         distinct: false, # values in the column are not unique
       #         nullable: :nulls_last # we might see NULL values (bottom)
       #       ),
       #       Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-      #         attribute: :id,
+      #         attribute_name: :id,
       #         order_expression: Project.arel_table[:id].asc
       #       )
       #     ])
@@ -93,7 +93,7 @@ module Gitlab
         end
 
         def cursor_attributes_for_node(node)
-          column_definitions.each_with_object({}) do |column_definition, hash|
+          column_definitions.each_with_object({}.with_indifferent_access) do |column_definition, hash|
             field_value = node[column_definition.attribute_name]
             hash[column_definition.attribute_name] = if field_value.is_a?(Time)
                                                        field_value.strftime('%Y-%m-%d %H:%M:%S.%N %Z')
@@ -162,7 +162,7 @@ module Gitlab
         # rubocop: disable CodeReuse/ActiveRecord
         def apply_cursor_conditions(scope, values = {})
           scope = apply_custom_projections(scope)
-          scope.where(build_where_values(values))
+          scope.where(build_where_values(values.with_indifferent_access))
         end
         # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/lib/gitlab/pagination/offset_header_builder.rb b/lib/gitlab/pagination/offset_header_builder.rb
index 32089e40932..555f0e5a607 100644
--- a/lib/gitlab/pagination/offset_header_builder.rb
+++ b/lib/gitlab/pagination/offset_header_builder.rb
@@ -5,9 +5,9 @@ module Gitlab
     class OffsetHeaderBuilder
       attr_reader :request_context, :per_page, :page, :next_page, :prev_page, :total, :total_pages
 
-      delegate :params, :header, :request, to: :request_context
+      delegate :request, to: :request_context
 
-      def initialize(request_context:, per_page:, page:, next_page:, prev_page: nil, total:, total_pages:)
+      def initialize(request_context:, per_page:, page:, next_page:, prev_page: nil, total: nil, total_pages: nil, params: nil)
         @request_context = request_context
         @per_page = per_page
         @page = page
@@ -15,6 +15,7 @@ module Gitlab
         @prev_page = prev_page
         @total = total
         @total_pages = total_pages
+        @params = params
       end
 
       def execute(exclude_total_headers: false, data_without_counts: false)
@@ -56,10 +57,24 @@ module Gitlab
       end
 
       def page_href(next_page_params = {})
-        query_params = params.merge(**next_page_params, per_page: params[:per_page]).to_query
+        query_params = params.merge(**next_page_params, per_page: per_page).to_query
 
         build_page_url(query_params: query_params)
       end
+
+      def params
+        @params || request_context.params
+      end
+
+      def header(name, value)
+        if request_context.respond_to?(:header)
+          # For Grape API
+          request_context.header(name, value)
+        else
+          # For rails controllers
+          request_context.response.headers[name] = value
+        end
+      end
     end
   end
 end