diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-23 23:50:01 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-23 23:50:01 +0300 |
| commit | 459309fa57e86599c53d0d3f867053ceb24d432b (patch) | |
| tree | 590bcf8118441e8eb39aa13e9bb178809a0ed9ae /app/serializers/deployment_entity.rb | |
| parent | 3203367e4ab0fdc1281dd265d0452178e87ac405 (diff) | |
| parent | d86b77bf20474702631d5fd89177c54a9f928760 (diff) | |
Merge branch '66037-deployment-user' into 'master'
Return correct user for manual deployments
See merge request gitlab-org/gitlab-ce!32004
Diffstat (limited to 'app/serializers/deployment_entity.rb')
| -rw-r--r-- | app/serializers/deployment_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index d6466ad1cdd..8b967459173 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -21,7 +21,7 @@ class DeploymentEntity < Grape::Entity expose :deployed_at expose :tag expose :last? - expose :user, using: UserEntity + expose :deployed_by, as: :user, using: UserEntity expose :deployable do |deployment, opts| deployment.deployable.yield_self do |deployable| |