diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-12 20:07:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-12 20:07:37 +0300 |
| commit | 6fbfa0607662197817dec0698362271a7b432e6d (patch) | |
| tree | 7a84ca25921ae62ff3fbe84e1d5610c0fdd7f19d /app | |
| parent | c59f68e8d11aeaf7d6d4d129a077929913da29ce (diff) | |
| parent | 0723df5286498593c43f0a5bdb78e8ab0f9b2db8 (diff) | |
Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into 'master'
Always return the deployment in the UpdateDeploymentService#execute method
Closes gitlab-ee#11124
See merge request gitlab-org/gitlab-ce!27322
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/update_deployment_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/update_deployment_service.rb b/app/services/update_deployment_service.rb index aa7fcca1e2a..49a7d0178f4 100644 --- a/app/services/update_deployment_service.rb +++ b/app/services/update_deployment_service.rb @@ -27,6 +27,8 @@ class UpdateDeploymentService deployment.tap(&:update_merge_request_metrics!) end + + deployment end private |