From 78a4189ece4f8d125eefbfdf6619d3452820bb8e Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Wed, 21 Feb 2018 04:03:12 +0100 Subject: Show timeout information on job's page --- app/serializers/build_details_entity.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/serializers') diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 69d46f5ec14..d1a4a9561d2 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -5,6 +5,11 @@ class BuildDetailsEntity < JobEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity + expose :timeout, if: -> (*) { !build.used_timeout.nil? } do |build| + { value: build.used_timeout_user_readable, + source: build.timeout_source } + end + 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) -- cgit v1.2.1 From 36753b78c065a54d7501f37f69fb49506f26688c Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Mon, 26 Feb 2018 16:35:08 +0100 Subject: Replace user_readable with human_readable --- app/serializers/build_details_entity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index d1a4a9561d2..17769790371 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -6,7 +6,7 @@ class BuildDetailsEntity < JobEntity expose :pipeline, using: PipelineEntity expose :timeout, if: -> (*) { !build.used_timeout.nil? } do |build| - { value: build.used_timeout_user_readable, + { value: build.used_timeout_human_readable, source: build.timeout_source } end -- cgit v1.2.1 From 1b0b8b9c02642ac19b9f5019cdd38fcec280c2a7 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Wed, 28 Feb 2018 21:36:01 +0100 Subject: Change timeout_source to enum --- app/serializers/build_details_entity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 17769790371..0ffc537dfd8 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -7,7 +7,7 @@ class BuildDetailsEntity < JobEntity expose :timeout, if: -> (*) { !build.used_timeout.nil? } do |build| { value: build.used_timeout_human_readable, - source: build.timeout_source } + source: build.present.timeout_source } end expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity -- cgit v1.2.1 From 1dde609ca6b130aa0a3d39e929edee7e770e62fc Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 1 Mar 2018 03:12:32 +0100 Subject: Move job timeout information to new ci_builds_metadata table --- app/serializers/build_details_entity.rb | 5 +---- app/serializers/build_metadata_entity.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 app/serializers/build_metadata_entity.rb (limited to 'app/serializers') 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| diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb new file mode 100644 index 00000000000..71c7295ba9f --- /dev/null +++ b/app/serializers/build_metadata_entity.rb @@ -0,0 +1,10 @@ +class BuildMetadataEntity < Grape::Entity + + expose :used_timeout_human_readable do |metadata| + metadata.used_timeout_human_readable unless metadata.used_timeout.nil? + end + + expose :timeout_source do |metadata| + metadata.present.timeout_source + end +end -- cgit v1.2.1 From 2ed1d5418b61f09e27173b364b9ad5f064a07823 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 1 Mar 2018 19:43:10 +0100 Subject: Fix static analysis offences --- app/serializers/build_metadata_entity.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb index 71c7295ba9f..4b6a538665d 100644 --- a/app/serializers/build_metadata_entity.rb +++ b/app/serializers/build_metadata_entity.rb @@ -1,5 +1,4 @@ class BuildMetadataEntity < Grape::Entity - expose :used_timeout_human_readable do |metadata| metadata.used_timeout_human_readable unless metadata.used_timeout.nil? end -- cgit v1.2.1 From d58d3098f159a17fbcf1ae27165c249722990988 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 6 Mar 2018 16:25:13 +0100 Subject: Rename used_timeout to timeout --- app/serializers/build_metadata_entity.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/serializers') diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb index 4b6a538665d..39f429aa6c3 100644 --- a/app/serializers/build_metadata_entity.rb +++ b/app/serializers/build_metadata_entity.rb @@ -1,6 +1,6 @@ class BuildMetadataEntity < Grape::Entity - expose :used_timeout_human_readable do |metadata| - metadata.used_timeout_human_readable unless metadata.used_timeout.nil? + expose :timeout_human_readable do |metadata| + metadata.timeout_human_readable unless metadata.timeout.nil? end expose :timeout_source do |metadata| -- cgit v1.2.1 From afcc57abfdcb11001803655f938187cbdc96b67c Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 20 Mar 2018 23:21:17 +0100 Subject: Rename metadata relation and methods --- app/serializers/build_details_entity.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index ca4480fe2b1..99ca0bd158b 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -5,7 +5,9 @@ class BuildDetailsEntity < JobEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity - expose :metadata, using: BuildMetadataEntity + expose :metadata, using: BuildMetadataEntity do |build| + build.ensure_metadata + end expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity expose :erase_path, if: -> (*) { build.erasable? && can?(current_user, :erase_build, build) } do |build| -- cgit v1.2.1 From 973e4030b13adbcc4eb7fad347b928a5164a04ff Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 22 Mar 2018 17:52:28 +0100 Subject: Refactor build_metadata --- app/serializers/build_details_entity.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/serializers') diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 99ca0bd158b..ca4480fe2b1 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -5,9 +5,7 @@ class BuildDetailsEntity < JobEntity expose :runner, using: RunnerEntity expose :pipeline, using: PipelineEntity - expose :metadata, using: BuildMetadataEntity do |build| - build.ensure_metadata - 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| -- cgit v1.2.1