Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 8 deletions

diff --git a/app/services/boards/base_items_list_service.rb b/app/services/boards/base_items_list_service.rb
index bf68aee2c1f..a4b1be1e599 100644
--- a/app/services/boards/base_items_list_service.rb
+++ b/app/services/boards/base_items_list_service.rb
@@ -13,14 +13,17 @@ module Boards
 
     # rubocop: disable CodeReuse/ActiveRecord
     def metadata(required_fields = [:issue_count, :total_issue_weight])
-      fields = metadata_fields(required_fields)
-      keys = fields.keys
-      # TODO: eliminate need for SQL literal fragment
-      columns = Arel.sql(fields.values_at(*keys).join(', '))
-      results = item_model.where(id: collection_ids)
-      results = results.select(columns)
-
-      Hash[keys.zip(results.pluck(columns).flatten)]
+      # Failing tests in spec/requests/api/graphql/boards/board_lists_query_spec.rb
+      ::Gitlab::Database.allow_cross_joins_across_databases(url: "https://gitlab.com/gitlab-org/gitlab/-/issues/417465") do
+        fields = metadata_fields(required_fields)
+        keys = fields.keys
+        # TODO: eliminate need for SQL literal fragment
+        columns = Arel.sql(fields.values_at(*keys).join(', '))
+        results = item_model.where(id: collection_ids)
+        results = results.select(columns)
+
+        Hash[keys.zip(results.pluck(columns).flatten)]
+      end
     end
     # rubocop: enable CodeReuse/ActiveRecord