Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-01 05:12:32 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 14:57:40 +0300
commit1dde609ca6b130aa0a3d39e929edee7e770e62fc (patch)
tree5cd6b85eaf9c49e7c14aa23c5c2aa5814f1d955b /app/serializers/build_details_entity.rb
parentd34e937b93b103435a59e6759a9f30e9f8addc11 (diff)
Move job timeout information to new ci_builds_metadata table
Diffstat (limited to 'app/serializers/build_details_entity.rb')
-rw-r--r--app/serializers/build_details_entity.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 0ffc537dfd8..ca4480fe2b1 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -5,10 +5,7 @@ class BuildDetailsEntity < JobEntity
expose :runner, using: RunnerEntity
expose :pipeline, using: PipelineEntity
- expose :timeout, if: -> (*) { !build.used_timeout.nil? } do |build|
- { value: build.used_timeout_human_readable,
- source: build.present.timeout_source }
- end
+ expose :metadata, using: BuildMetadataEntity
expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity
expose :erase_path, if: -> (*) { build.erasable? && can?(current_user, :erase_build, build) } do |build|