diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-05 11:45:36 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-05 11:45:36 +0000 |
| commit | 425ddcc5a8f65b44546daa8c1885e4e4f45e5f32 (patch) | |
| tree | 686da2eb8ee8755f7e1bcd7a91c61559638fe547 /app/serializers | |
| parent | 2ae6c47ddd27d9f76bc2e4326e91fc8d272896c1 (diff) | |
| parent | 13c091c443502a6824b78c4e93637b3fc794a47c (diff) | |
| download | gitlab-ce-425ddcc5a8f65b44546daa8c1885e4e4f45e5f32.tar.gz | |
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/serializers')
| -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 |