Merge branch '56130-deployment-date' into 'master'

Expose finished_at for the Deployment entity

See merge request gitlab-org/gitlab-ce!31808

app/serializers/deployment_entity.rb

@@ -18,6 +18,7 @@ class DeploymentEntity < Grape::Entity
   end
 
   expose :created_at
+  expose :finished_at
   expose :tag
   expose :last?
   expose :user, using: UserEntity

app/serializers/deployment_serializer.rb

@@ -4,7 +4,7 @@ class DeploymentSerializer < BaseSerializer
   entity DeploymentEntity
 
   def represent_concise(resource, opts = {})
-    opts[:only] = [:iid, :id, :sha, :created_at, :tag, :last?, :id, ref: [:name]]
+    opts[:only] = [:iid, :id, :sha, :created_at, :finished_at, :tag, :last?, :id, ref: [:name]]
     represent(resource, opts)
   end
 end

changelogs/unreleased/56130-deployment-date.yml

+---
+title: Add finished_at to the internal API Deployment entity
+merge_request: 31808
+author:
+type: other

spec/fixtures/api/schemas/deployment.json

@@ -3,6 +3,7 @@
   "required": [
     "sha",
     "created_at",
+    "finished_at",
     "iid",
     "tag",
     "last?",
@@ -11,6 +12,7 @@
   ],
   "properties": {
     "created_at": { "type": "string" },
+    "finished_at": { "type": ["string", "null"] },
     "id": { "type": "integer" },
     "iid": { "type": "integer" },
     "last?": { "type": "boolean" },

spec/serializers/deployment_entity_spec.rb

@@ -32,6 +32,10 @@ describe DeploymentEntity do
     expect(subject).to include(:created_at)
   end
 
+  it 'exposes finished_at' do
+    expect(subject).to include(:finished_at)
+  end
+
   context 'when the pipeline has another manual action' do
     let(:other_build) { create(:ci_build, :manual, name: 'another deploy', pipeline: pipeline) }
     let!(:other_deployment) { create(:deployment, deployable: other_build) }