Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 74 deletions

diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
index a60b00b2ee8..8f50f38bbed 100644
--- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
@@ -7,6 +7,7 @@ code_quality:
   variables:
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
+    CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/security-products/codequality:12-5-stable"
   script:
     - |
       if ! docker info &>/dev/null; then
@@ -14,11 +15,12 @@ code_quality:
           export DOCKER_HOST='tcp://localhost:2375'
         fi
       fi
+    - docker pull --quiet "$CODE_QUALITY_IMAGE"
     - docker run
         --env SOURCE_CODE="$PWD"
         --volume "$PWD":/code
         --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:12-5-stable" /code
+        "$CODE_QUALITY_IMAGE" /code
   artifacts:
     reports:
       codequality: gl-code-quality-report.json
diff --git a/lib/gitlab/graphql/connections/keyset/connection.rb b/lib/gitlab/graphql/connections/keyset/connection.rb
index e42a705a78a..5de075f2f7a 100644
--- a/lib/gitlab/graphql/connections/keyset/connection.rb
+++ b/lib/gitlab/graphql/connections/keyset/connection.rb
@@ -32,18 +32,11 @@ module Gitlab
         class Connection < GraphQL::Relay::BaseConnection
           include Gitlab::Utils::StrongMemoize
 
-          # TODO https://gitlab.com/gitlab-org/gitlab/issues/35104
-          include Gitlab::Graphql::Connections::Keyset::LegacyKeysetConnection
-
           def cursor_from_node(node)
-            return legacy_cursor_from_node(node) if use_legacy_pagination?
-
             encoded_json_from_ordering(node)
           end
 
           def sliced_nodes
-            return legacy_sliced_nodes if use_legacy_pagination?
-
             @sliced_nodes ||=
               begin
                 OrderInfo.validate_ordering(ordered_nodes, order_list)
diff --git a/lib/gitlab/graphql/connections/keyset/legacy_keyset_connection.rb b/lib/gitlab/graphql/connections/keyset/legacy_keyset_connection.rb
deleted file mode 100644
index baf900d1048..00000000000
--- a/lib/gitlab/graphql/connections/keyset/legacy_keyset_connection.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-# TODO https://gitlab.com/gitlab-org/gitlab/issues/35104
-module Gitlab
-  module Graphql
-    module Connections
-      module Keyset
-        module LegacyKeysetConnection
-          def legacy_cursor_from_node(node)
-            encode(node[legacy_order_field].to_s)
-          end
-
-          # rubocop: disable CodeReuse/ActiveRecord
-          def legacy_sliced_nodes
-            @sliced_nodes ||=
-              begin
-                sliced = nodes
-
-                sliced = sliced.where(legacy_before_slice) if before.present?
-                sliced = sliced.where(legacy_after_slice) if after.present?
-
-                sliced
-              end
-          end
-          # rubocop: enable CodeReuse/ActiveRecord
-
-          private
-
-          def use_legacy_pagination?
-            strong_memoize(:feature_disabled) do
-              Feature.disabled?(:graphql_keyset_pagination, default_enabled: true)
-            end
-          end
-
-          def legacy_before_slice
-            if legacy_sort_direction == :asc
-              arel_table[legacy_order_field].lt(decode(before))
-            else
-              arel_table[legacy_order_field].gt(decode(before))
-            end
-          end
-
-          def legacy_after_slice
-            if legacy_sort_direction == :asc
-              arel_table[legacy_order_field].gt(decode(after))
-            else
-              arel_table[legacy_order_field].lt(decode(after))
-            end
-          end
-
-          def legacy_order_info
-            @legacy_order_info ||= nodes.order_values.first
-          end
-
-          def legacy_order_field
-            @legacy_order_field ||= legacy_order_info&.expr&.name || nodes.primary_key
-          end
-
-          def legacy_sort_direction
-            @legacy_order_direction ||= legacy_order_info&.direction || :desc
-          end
-        end
-      end
-    end
-  end
-end