diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /app/serializers/ci | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/serializers/ci')
-rw-r--r-- | app/serializers/ci/job_entity.rb | 2 | ||||
-rw-r--r-- | app/serializers/ci/job_serializer.rb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/serializers/ci/job_entity.rb b/app/serializers/ci/job_entity.rb index b6b11e54a16..813938c2a18 100644 --- a/app/serializers/ci/job_entity.rb +++ b/app/serializers/ci/job_entity.rb @@ -41,6 +41,8 @@ module Ci expose :scheduled?, as: :scheduled expose :scheduled_at, if: -> (*) { scheduled? } expose :created_at + expose :queued_at + expose :queued_duration expose :updated_at expose :detailed_status, as: :status, with: DetailedStatusEntity expose :callout_message, if: -> (*) { failed? && !job.script_failure? } diff --git a/app/serializers/ci/job_serializer.rb b/app/serializers/ci/job_serializer.rb index 01f9e223943..37213ee284a 100644 --- a/app/serializers/ci/job_serializer.rb +++ b/app/serializers/ci/job_serializer.rb @@ -3,10 +3,5 @@ module Ci class JobSerializer < BaseSerializer entity Ci::JobEntity - - def represent_status(resource) - data = represent(resource, { only: [:status] }) - data.fetch(:status, {}) - end end end |