diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:54:06 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:54:06 +0000 |
| commit | 8b37ce6f7f6d29604c42c65f3986d60dce0abd6c (patch) | |
| tree | 1bb0959f49edd0980a2336923c6c5399122bf99a /app/serializers | |
| parent | b2ccfc084d790d012f43b8f5ffeaaee4c913a08c (diff) | |
| parent | 6ecde0076afa83e30608ea9caba924bbab66a123 (diff) | |
| download | gitlab-ce-8b37ce6f7f6d29604c42c65f3986d60dce0abd6c.tar.gz | |
Merge branch 'add-per-runner-job-timeout' into 'master'
Add per runner job timeout
Closes #43426
See merge request gitlab-org/gitlab-ce!17221
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 2 | ||||
| -rw-r--r-- | app/serializers/build_metadata_entity.rb | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 69d46f5ec14..ca4480fe2b1 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -5,6 +5,8 @@ class BuildDetailsEntity < JobEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity + 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| erase_project_job_path(project, build) diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb new file mode 100644 index 00000000000..39f429aa6c3 --- /dev/null +++ b/app/serializers/build_metadata_entity.rb @@ -0,0 +1,9 @@ +class BuildMetadataEntity < Grape::Entity + expose :timeout_human_readable do |metadata| + metadata.timeout_human_readable unless metadata.timeout.nil? + end + + expose :timeout_source do |metadata| + metadata.present.timeout_source + end +end |