diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-15 15:51:30 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-15 15:51:30 +0300 |
| commit | 87589dee9230674ab25170033e51799ec77ae5c4 (patch) | |
| tree | beac656f9c0829a8ab7b114f9aee66c0828ce681 /app | |
| parent | d7ecf41b0bb01e9469fb56cf4d985278ebadd127 (diff) | |
| parent | 5d11f55f7672c9ac2852a354dc03e9914f0c4312 (diff) | |
Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'
Send deployment_status when job starts environment
Closes #52614
See merge request gitlab-org/gitlab-ce!22354
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 7bdcfcc38f7..066a5b1885c 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -9,7 +9,7 @@ class BuildDetailsEntity < JobEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity - expose :deployment_status, if: -> (*) { build.has_environment? } do + expose :deployment_status, if: -> (*) { build.starts_environment? } do expose :deployment_status, as: :status expose :persisted_environment, as: :environment, with: EnvironmentEntity |