diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 15:34:12 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 15:34:12 +0300 |
| commit | 30b0dcb7599b0f90b46dfcc4586dcfc7c5232148 (patch) | |
| tree | 8134097a30828b86c204d38377aab00154e18c92 /app | |
| parent | b1604f7d8f0095d637036721244830e8d3181596 (diff) | |
| parent | 18159235a3150dbd3c404e1d7724d5e653bb21a5 (diff) | |
Merge branch '56130-deployment-date' into 'master'
Expose finished_at for the Deployment entity
See merge request gitlab-org/gitlab-ce!31808
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/deployment_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/deployment_serializer.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index 943c707218d..6e91317eb20 100644 --- a/app/serializers/deployment_entity.rb +++ b/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 diff --git a/app/serializers/deployment_serializer.rb b/app/serializers/deployment_serializer.rb index 04db6b88489..3fd3e1b9cc8 100644 --- a/app/serializers/deployment_serializer.rb +++ b/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 |