diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/policies/environment_policy.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/policies/environment_policy.rb')
-rw-r--r-- | app/policies/environment_policy.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/policies/environment_policy.rb b/app/policies/environment_policy.rb index e9e3517b3da..72db6d31764 100644 --- a/app/policies/environment_policy.rb +++ b/app/policies/environment_policy.rb @@ -4,12 +4,12 @@ class EnvironmentPolicy < BasePolicy delegate { @subject.project } condition(:stop_with_deployment_allowed) do - @subject.stop_action_available? && - can?(:create_deployment) && can?(:update_build, @subject.stop_action) + @subject.stop_actions_available? && + can?(:create_deployment) && can?(:update_build, @subject.stop_actions.last) end condition(:stop_with_update_allowed) do - !@subject.stop_action_available? && can?(:update_environment, @subject) + !@subject.stop_actions_available? && can?(:update_environment, @subject) end condition(:stopped) do |