Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 17 deletions

diff --git a/lib/gitlab/graphql/connections.rb b/lib/gitlab/graphql/connections.rb
index 0c0bfe5a458..08d5cd0b72e 100644
--- a/lib/gitlab/graphql/connections.rb
+++ b/lib/gitlab/graphql/connections.rb
@@ -16,10 +16,6 @@ module Gitlab
           Gitlab::Graphql::ExternallyPaginatedArray,
           Gitlab::Graphql::Connections::ExternallyPaginatedArrayConnection
         )
-        GraphQL::Relay::BaseConnection.register_connection_implementation(
-          Gitlab::Graphql::Pagination::Relations::OffsetActiveRecordRelation,
-          Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection
-        )
       end
     end
   end
diff --git a/lib/gitlab/graphql/pagination/offset_active_record_relation_connection.rb b/lib/gitlab/graphql/pagination/offset_active_record_relation_connection.rb
index c852fbf0ab8..33f84701562 100644
--- a/lib/gitlab/graphql/pagination/offset_active_record_relation_connection.rb
+++ b/lib/gitlab/graphql/pagination/offset_active_record_relation_connection.rb
@@ -6,7 +6,7 @@
 module Gitlab
   module Graphql
     module Pagination
-      class OffsetActiveRecordRelationConnection < GraphQL::Relay::RelationConnection
+      class OffsetActiveRecordRelationConnection < GraphQL::Pagination::ActiveRecordRelationConnection
       end
     end
   end
diff --git a/lib/gitlab/graphql/pagination/relations/offset_active_record_relation.rb b/lib/gitlab/graphql/pagination/relations/offset_active_record_relation.rb
deleted file mode 100644
index 2e5a0d66d4e..00000000000
--- a/lib/gitlab/graphql/pagination/relations/offset_active_record_relation.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Graphql
-    module Pagination
-      module Relations
-        class OffsetActiveRecordRelation < ::ActiveRecord::Relation
-        end
-      end
-    end
-  end
-end