summaryrefslogtreecommitdiff
path: root/app/models/deployment.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-04 17:52:36 +0900
committerShinya Maeda <shinya@gitlab.com>2018-10-04 17:52:36 +0900
commit2dd7339c0149034aa5faa4029cff1a82aef35d21 (patch)
treebb0aac16f5a0a4ddf96c64079095fee48df48dfb /app/models/deployment.rb
parentd3b9e4ef38f09a9be84b687f847984d5605cc95a (diff)
downloadgitlab-ce-2dd7339c0149034aa5faa4029cff1a82aef35d21.tar.gz
Add scheduled actions in deployment entity
Diffstat (limited to 'app/models/deployment.rb')
-rw-r--r--app/models/deployment.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 6962b54441b..ed61135cb47 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -44,7 +44,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)