diff options
author | Steve Azzopardi <steveazz@outlook.com> | 2018-11-08 09:02:16 +0100 |
---|---|---|
committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-08 09:02:16 +0100 |
commit | 7a6cae01c80dda564726ef363191b09d359ec2ba (patch) | |
tree | 6f526b998098cd43ce88087467923991735d3c6a /app/serializers/deployment_entity.rb | |
parent | 7c4546a1161cd4cd5371f988f62c2e11812e54e6 (diff) | |
parent | 15e519451e843b6d55a2c35bbefe039003b15c25 (diff) | |
download | gitlab-ce-7a6cae01c80dda564726ef363191b09d359ec2ba.tar.gz |
Merge branch 'master' into 11-5-stable-prepare-rc4
Diffstat (limited to 'app/serializers/deployment_entity.rb')
-rw-r--r-- | app/serializers/deployment_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index 344148a1fb7..aa1d9e6292c 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -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 |