diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-30 17:43:20 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-30 17:43:20 +0300 |
| commit | 7274362a1e043079908eea0ad50ef54e2e7b9a83 (patch) | |
| tree | 2ceb505eaa8e7453fce8da9e14dba229a9b71c42 /app | |
| parent | 79011fab0852de16e6b850ced4f282c97f4e8301 (diff) | |
| parent | f246db4446466de58ba8618fb77bea63ca976551 (diff) | |
Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'
Fix users cannot access job detail page when deployable does not exist
Closes #65216
See merge request gitlab-org/gitlab-ce!32247
Diffstat (limited to 'app')
| -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 8b967459173..94a827658f0 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -23,7 +23,7 @@ class DeploymentEntity < Grape::Entity expose :last? expose :deployed_by, as: :user, using: UserEntity - expose :deployable do |deployment, opts| + expose :deployable, if: -> (deployment) { deployment.deployable.present? } do |deployment, opts| deployment.deployable.yield_self do |deployable| if include_details? JobEntity.represent(deployable, opts) |