Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 16 insertions, 1 deletions

diff --git a/lib/gitlab/graphql/board/issues_connection_extension.rb b/lib/gitlab/graphql/board/issues_connection_extension.rb
new file mode 100644
index 00000000000..9dcd8c92592
--- /dev/null
+++ b/lib/gitlab/graphql/board/issues_connection_extension.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Gitlab
+  module Graphql
+    module Board
+      class IssuesConnectionExtension < GraphQL::Schema::Field::ConnectionExtension
+        def after_resolve(value:, object:, context:, **rest)
+          ::Boards::Issues::ListService
+            .initialize_relative_positions(object.list.board, context[:current_user], value.nodes)
+
+          value
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/connection_collection_methods.rb b/lib/gitlab/graphql/connection_collection_methods.rb
index 0e2c4a98bb6..2818a9d4e88 100644
--- a/lib/gitlab/graphql/connection_collection_methods.rb
+++ b/lib/gitlab/graphql/connection_collection_methods.rb
@@ -6,7 +6,7 @@ module Gitlab
       extend ActiveSupport::Concern
 
       included do
-        delegate :to_a, :size, :include?, :empty?, to: :nodes
+        delegate :to_a, :size, :map, :include?, :empty?, to: :nodes
       end
     end
   end