From 5064bf8c5647d4c4430cbb4d097cf1592416de29 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 25 Mar 2020 09:08:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/policies/environment_policy.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/policies/environment_policy.rb') diff --git a/app/policies/environment_policy.rb b/app/policies/environment_policy.rb index be512dd3b94..f0187a39687 100644 --- a/app/policies/environment_policy.rb +++ b/app/policies/environment_policy.rb @@ -12,7 +12,13 @@ class EnvironmentPolicy < BasePolicy !@subject.stop_action_available? && can?(:update_environment, @subject) end + condition(:stopped) do + @subject.stopped? + end + rule { stop_with_deployment_allowed | stop_with_update_allowed }.enable :stop_environment + + rule { ~stopped }.prevent(:destroy_environment) end EnvironmentPolicy.prepend_if_ee('EE::EnvironmentPolicy') -- cgit v1.2.1