summaryrefslogtreecommitdiff
path: root/app/models/environment_status.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-29 09:06:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-29 09:06:31 +0000
commit6b13a226ddfc49140d58e7e88f8703ae0ed90574 (patch)
tree9a92431e484354f43230fa87adc00a2edbf6f09c /app/models/environment_status.rb
parent2ac93cb80c4c0a57fde86de8262b569d1e9b9e51 (diff)
downloadgitlab-ce-6b13a226ddfc49140d58e7e88f8703ae0ed90574.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/environment_status.rb')
-rw-r--r--app/models/environment_status.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/environment_status.rb b/app/models/environment_status.rb
index d7dc64190d6..3eca8c91e40 100644
--- a/app/models/environment_status.rb
+++ b/app/models/environment_status.rb
@@ -78,7 +78,7 @@ class EnvironmentStatus
def self.build_environments_status(mr, user, pipeline)
return [] unless pipeline
- pipeline.environments.available.map do |environment|
+ pipeline.environments.includes(:project).available.map do |environment|
next unless Ability.allowed?(user, :read_environment, environment)
EnvironmentStatus.new(pipeline.project, environment, mr, pipeline.sha)