From a880341a7b3a164ba381620852cc3ea0777f67ad Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 May 2021 18:10:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/environment_status.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/environment_status.rb') diff --git a/app/models/environment_status.rb b/app/models/environment_status.rb index 55ea4e2fe18..07c0983f239 100644 --- a/app/models/environment_status.rb +++ b/app/models/environment_status.rb @@ -100,7 +100,7 @@ class EnvironmentStatus def self.build_environments_status(mr, user, pipeline) return [] unless pipeline - pipeline.environments.includes(:project).available.map do |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) -- cgit v1.2.1