diff options
Diffstat (limited to 'app/serializers/build_details_entity.rb')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index bbcfa5ab346..ff910e8625c 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -8,27 +8,8 @@ class BuildDetailsEntity < JobEntity expose :user, using: UserEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity - -<<<<<<< HEAD expose :deployment_status, with: DetailedStatusEntity - # expose :deployment_status, if: -> (*) { build.starts_environment? } do - # expose :deployment_status, as: :status - - # expose :persisted_environment, as: :environment, with: EnvironmentEntity - # end -======= - expose :deployment_status, with: DetailedStatusEntity do |build| - build.last_deployment.detailed_status - end ->>>>>>> Use deployment status in job log page - - # expose :deployment_status, if: -> (*) { build.starts_environment? } do - # expose :deployment_status, as: :status - - # expose :persisted_environment, as: :environment, with: EnvironmentEntity - # end - expose :metadata, using: BuildMetadataEntity expose :artifact, if: -> (*) { can?(current_user, :read_build, build) } do |