Add scheduled actions in deployment entity
This commit is contained in:
parent
d3b9e4ef38
commit
2dd7339c01
|
@ -245,10 +245,14 @@ module Ci
|
|||
.fabricate!
|
||||
end
|
||||
|
||||
def other_actions
|
||||
def other_manual_actions
|
||||
pipeline.manual_actions.where.not(name: name)
|
||||
end
|
||||
|
||||
def other_scheduled_actions
|
||||
pipeline.scheduled_actions.where.not(name: name)
|
||||
end
|
||||
|
||||
def pages_generator?
|
||||
Gitlab.config.pages.enabled &&
|
||||
self.name == 'pages'
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -25,4 +25,5 @@ class DeploymentEntity < Grape::Entity
|
|||
expose :commit, using: CommitEntity
|
||||
expose :deployable, using: JobEntity
|
||||
expose :manual_actions, using: JobEntity
|
||||
expose :scheduled_actions, using: JobEntity
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue