diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-06 15:19:52 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-06 17:15:15 +0200 |
| commit | 6c0fc62ef5c4fa4535174a9f187b9853f0fb90ac (patch) | |
| tree | 0db34e09c24d3b98baa48e4db6ac27e0b4324871 /app/models/deployment.rb | |
| parent | e533d43a8c03a9b47a7016f3fea01a00ca797778 (diff) | |
| download | gitlab-ce-6c0fc62ef5c4fa4535174a9f187b9853f0fb90ac.tar.gz | |
Take branch access into account when stopping environment
Diffstat (limited to 'app/models/deployment.rb')
| -rw-r--r-- | app/models/deployment.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index afad001d50f..37adfb4de73 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -85,8 +85,8 @@ class Deployment < ActiveRecord::Base end def stop_action - return nil unless on_stop.present? - return nil unless manual_actions + return unless on_stop.present? + return unless manual_actions @stop_action ||= manual_actions.find_by(name: on_stop) end |