Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/ci/parsers/terraform/tfplan.rb b/lib/gitlab/ci/parsers/terraform/tfplan.rb
index f9afa58f915..041d73cd914 100644
--- a/lib/gitlab/ci/parsers/terraform/tfplan.rb
+++ b/lib/gitlab/ci/parsers/terraform/tfplan.rb
@@ -34,7 +34,7 @@ module Gitlab
           def job_details(job)
             {
               'job_id' => job.id.to_s,
-              'job_name' => job.options.dig(:artifacts, :name).to_s,
+              'job_name' => job.name,
               'job_path' => Gitlab::Routing.url_helpers.project_job_path(job.project, job)
             }
           end
diff --git a/lib/gitlab/pagination/keyset/iterator.rb b/lib/gitlab/pagination/keyset/iterator.rb
index bcd17fd0d34..33587f9d6f4 100644
--- a/lib/gitlab/pagination/keyset/iterator.rb
+++ b/lib/gitlab/pagination/keyset/iterator.rb
@@ -9,7 +9,7 @@ module Gitlab
           raise(UnsupportedScopeOrder) unless success
 
           @cursor = cursor
-          @order = Gitlab::Pagination::Keyset::Order.extract_keyset_order_object(scope)
+          @order = Gitlab::Pagination::Keyset::Order.extract_keyset_order_object(@scope)
           @use_union_optimization = in_operator_optimization_options ? false : use_union_optimization
           @in_operator_optimization_options = in_operator_optimization_options
         end
diff --git a/lib/gitlab/pagination/keyset/order.rb b/lib/gitlab/pagination/keyset/order.rb
index 80726fc8efd..1a00692bdbe 100644
--- a/lib/gitlab/pagination/keyset/order.rb
+++ b/lib/gitlab/pagination/keyset/order.rb
@@ -155,7 +155,7 @@ module Gitlab
         def apply_cursor_conditions(scope, values = {}, options = { use_union_optimization: false, in_operator_optimization_options: nil })
           values ||= {}
           transformed_values = values.with_indifferent_access
-          scope = apply_custom_projections(scope.dup)
+          scope = apply_custom_projections(scope)
 
           where_values = build_where_values(transformed_values)