diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
| commit | 6c237350b3967881cf9da50ec13a536e1a7e6755 (patch) | |
| tree | 8ce3d51df9ce9e9716ef3ce8626b973d7f882547 /app/services | |
| parent | f73fb2444985155c5bbec4fc43de9fbfb6710825 (diff) | |
| parent | af00a1591412655202a634fbca999b80b97a676e (diff) | |
| download | gitlab-ce-6c237350b3967881cf9da50ec13a536e1a7e6755.tar.gz | |
Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'
Make it more explicit what environment stop actions are
Closes #48672
See merge request gitlab-org/gitlab-ce!20587
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/stop_environments_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/stop_environments_service.rb b/app/services/ci/stop_environments_service.rb index 43c9a065fcf..439746e82bd 100644 --- a/app/services/ci/stop_environments_service.rb +++ b/app/services/ci/stop_environments_service.rb @@ -8,7 +8,7 @@ module Ci return unless @ref.present? environments.each do |environment| - next unless environment.stop_action? + next unless environment.stop_action_available? next unless can?(current_user, :stop_environment, environment) environment.stop_with_action!(current_user) |