diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 03:07:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 03:07:27 +0300 |
| commit | b7e6df1abde1112ae1fa0778f45d6053eec3f052 (patch) | |
| tree | a879d991b78433cbf419e4968c410982802dece3 /app/serializers/deploy_key_entity.rb | |
| parent | e924e9e7cb9df21b3bc3d51d5f955da28ba3a225 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/deploy_key_entity.rb')
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index e47d6454780..9a558d12bec 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -20,6 +20,7 @@ class DeployKeyEntity < Grape::Entity private def can_edit - Ability.allowed?(options[:user], :update_deploy_key, object) + Ability.allowed?(options[:user], :update_deploy_key, object) || + Ability.allowed?(options[:user], :update_deploy_keys_project, object.deploy_keys_project_for(options[:project])) end end |