diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-21 10:08:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-21 10:08:16 +0000 |
| commit | 6a3da45a22165f2f71c023e0656ff07820a1e60e (patch) | |
| tree | 27296bfe1fb29e70be6469adc704d7a9cf4df6a1 /lib/api | |
| parent | 4b0b2f1525be5feac0ae0953eb573ff24cc7b9c5 (diff) | |
| parent | c7bcebd56e264772a8fe177e64476ea7b2b80144 (diff) | |
| download | gitlab-ce-6a3da45a22165f2f71c023e0656ff07820a1e60e.tar.gz | |
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/api')
| -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) |