Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

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