diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 18:11:19 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 18:11:19 +0300 |
| commit | 349e423137e2c9bbdb5d77dc9ee37d70242dd1f8 (patch) | |
| tree | 1d256ec724a32cc4f665c3562ae3e3952c208a85 /app/services | |
| parent | 552013b47f3a37e4584f11faa82f5afb60fe8edc (diff) | |
| parent | d02e7226c47db88549f54d0fed0e2b33a726908d (diff) | |
Merge branch '29673-500-internal-server-error-when-enabling-a-deploy-key-more-than-once-through-api' into 'master'
Detect already enabled DeployKeys in EnableDeployKeyService
Closes #29673
See merge request !11010
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/enable_deploy_key_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/projects/enable_deploy_key_service.rb b/app/services/projects/enable_deploy_key_service.rb index 3cf4264ce9b..121385afca3 100644 --- a/app/services/projects/enable_deploy_key_service.rb +++ b/app/services/projects/enable_deploy_key_service.rb @@ -4,7 +4,10 @@ module Projects key = accessible_keys.find_by(id: params[:key_id] || params[:id]) return unless key - project.deploy_keys << key + unless project.deploy_keys.include?(key) + project.deploy_keys << key + end + key end |