diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 18:42:23 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 18:42:23 +0000 |
| commit | b41fe9bd6a9e410c63aeb20806bad99e37a3ec65 (patch) | |
| tree | 36f85e2865fc334038c6ba7035c379629bb6593d /lib | |
| parent | 33f4f161a1a417c17fc4c6d18e4dc01c33945ab5 (diff) | |
| parent | 739029bb0f03ff2bf70d67b3d2a09ddd196143a6 (diff) | |
| download | gitlab-ce-b41fe9bd6a9e410c63aeb20806bad99e37a3ec65.tar.gz | |
Merge branch 'security-dm-delete-deploy-key' into 'master'
[master] Fix API to remove deploy key from project instead of deleting it entirely
See merge request gitlab/gitlabhq!2379
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/deploy_keys.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb index 70d43ac1d79..b7aadc27e71 100644 --- a/lib/api/deploy_keys.rb +++ b/lib/api/deploy_keys.rb @@ -148,10 +148,10 @@ module API requires :key_id, type: Integer, desc: 'The ID of the deploy key' end delete ":id/deploy_keys/:key_id" do - key = user_project.deploy_keys.find(params[:key_id]) - not_found!('Deploy Key') unless key + deploy_key_project = user_project.deploy_keys_projects.find_by(deploy_key_id: params[:key_id]) + not_found!('Deploy Key') unless deploy_key_project - destroy_conditionally!(key) + destroy_conditionally!(deploy_key_project) end end end |