Commit 18159235 authored by Krasimir Angelov's avatar Krasimir Angelov

Add finished_at to the internal API Deployment entity

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/56130.
parent 94cf543f
......@@ -18,6 +18,7 @@ class DeploymentEntity < Grape::Entity
end
expose :created_at
expose :finished_at
expose :tag
expose :last?
expose :user, using: UserEntity
......
......@@ -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
---
title: Add finished_at to the internal API Deployment entity
merge_request: 31808
author:
type: other
......@@ -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" },
......
......@@ -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) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment