Add latest changes from gitlab-org/gitlab@master

3 files changed, 29 insertions, 0 deletions

diff --git a/lib/gitlab/graphql/connections.rb b/lib/gitlab/graphql/connections.rb
index 08d5cd0b72e..0c0bfe5a458 100644
--- a/lib/gitlab/graphql/connections.rb
+++ b/lib/gitlab/graphql/connections.rb
@@ -16,6 +16,10 @@ 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
new file mode 100644
index 00000000000..c852fbf0ab8
--- /dev/null
+++ b/lib/gitlab/graphql/pagination/offset_active_record_relation_connection.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# We use the Keyset / Stable cursor connection by default for ActiveRecord::Relation.
+# However, there are times when that may not be powerful enough (yet), and we
+# want to use standard offset pagination.
+module Gitlab
+  module Graphql
+    module Pagination
+      class OffsetActiveRecordRelationConnection < GraphQL::Relay::RelationConnection
+      end
+    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
new file mode 100644
index 00000000000..2e5a0d66d4e
--- /dev/null
+++ b/lib/gitlab/graphql/pagination/relations/offset_active_record_relation.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Graphql
+    module Pagination
+      module Relations
+        class OffsetActiveRecordRelation < ::ActiveRecord::Relation
+        end
+      end
+    end
+  end
+end