diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-05 14:45:36 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-05 14:45:36 +0300 |
| commit | 425ddcc5a8f65b44546daa8c1885e4e4f45e5f32 (patch) | |
| tree | 686da2eb8ee8755f7e1bcd7a91c61559638fe547 /app/models/deployment.rb | |
| parent | 2ae6c47ddd27d9f76bc2e4326e91fc8d272896c1 (diff) | |
| parent | 13c091c443502a6824b78c4e93637b3fc794a47c (diff) | |
Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'
Add the Play button for delayed jobs in environment page
Closes #52129
See merge request gitlab-org/gitlab-ce!22106
Diffstat (limited to 'app/models/deployment.rb')
| -rw-r--r-- | app/models/deployment.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index ee5b96e7454..37efbb04fce 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -55,7 +55,11 @@ class Deployment < ActiveRecord::Base end def manual_actions - @manual_actions ||= deployable.try(:other_actions) + @manual_actions ||= deployable.try(:other_manual_actions) + end + + def scheduled_actions + @scheduled_actions ||= deployable.try(:other_scheduled_actions) end def includes_commit?(commit) |