Commit 8e524e4d authored by Thong Kuah's avatar Thong Kuah

Allow callsite for EnvironmentStatus

There are about 500 calls from this callsite in our CI. Allowing this
callsite allows us to shrink the specs-based allowlist
parent 07259586
...@@ -100,11 +100,13 @@ class EnvironmentStatus ...@@ -100,11 +100,13 @@ class EnvironmentStatus
def self.build_environments_status(mr, user, pipeline) def self.build_environments_status(mr, user, pipeline)
return [] unless pipeline return [] unless pipeline
pipeline.environments_in_self_and_descendants.includes(:project).available.map do |environment| ::Gitlab::Database.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/340781') do
next unless Ability.allowed?(user, :read_environment, environment) pipeline.environments_in_self_and_descendants.includes(:project).available.map do |environment|
next unless Ability.allowed?(user, :read_environment, environment)
EnvironmentStatus.new(pipeline.project, environment, mr, pipeline.sha) EnvironmentStatus.new(pipeline.project, environment, mr, pipeline.sha)
end.compact end.compact
end
end end
private_class_method :build_environments_status private_class_method :build_environments_status
end end
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
- "./spec/models/clusters/applications/runner_spec.rb" - "./spec/models/clusters/applications/runner_spec.rb"
- "./spec/models/deployment_spec.rb" - "./spec/models/deployment_spec.rb"
- "./spec/models/environment_spec.rb" - "./spec/models/environment_spec.rb"
- "./spec/models/environment_status_spec.rb"
- "./spec/models/merge_request_spec.rb" - "./spec/models/merge_request_spec.rb"
- "./spec/models/project_spec.rb" - "./spec/models/project_spec.rb"
- "./spec/models/user_spec.rb" - "./spec/models/user_spec.rb"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment