diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-21 13:08:16 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-21 15:42:03 +0300 |
| commit | a3acf98ef2e922712b2d52ca524b3557452d8f34 (patch) | |
| tree | b69e7ea9ec637457945b0bc3640ab2adb838cc9a /lib | |
| parent | 71efad75c37fccae40d9a399a0ae9545f3f63a41 (diff) | |
Merge branch '33878-fix-edit-deploy-key' into 'master'
Fix edit button for deploy keys available from other projects
Closes #33878
See merge request !12301
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/deploy_keys.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb index 7cdee8aced7..d5c2f3d5094 100644 --- a/lib/api/deploy_keys.rb +++ b/lib/api/deploy_keys.rb @@ -86,7 +86,7 @@ module API at_least_one_of :title, :can_push end put ":id/deploy_keys/:key_id" do - key = user_project.deploy_keys.find(params.delete(:key_id)) + key = DeployKey.find(params.delete(:key_id)) authorize!(:update_deploy_key, key) |