Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-02-20 11:33:42 +0300
committerRobert Schilling <rschilling@student.tugraz.at>2017-02-20 11:33:42 +0300
commite7551214f33eb722ad48a8749db743a20d5ff17d (patch)
treee4757761d07c50211a22c8ec2d6ea874a2dfa257 /lib/api/deploy_keys.rb
parent12cd4c83604e43dc308ba13fa3d5a6571409c1f8 (diff)
API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
Diffstat (limited to 'lib/api/deploy_keys.rb')
-rw-r--r--lib/api/deploy_keys.rb22
1 files changed, 3 insertions, 19 deletions
diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb
index 982645c2f64..69e85c27a65 100644
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
@@ -93,20 +93,6 @@ module API
end
end
- desc 'Disable a deploy key for a project' do
- detail 'This feature was added in GitLab 8.11'
- success Entities::SSHKey
- end
- params do
- requires :key_id, type: Integer, desc: 'The ID of the deploy key'
- end
- delete ":id/deploy_keys/:key_id/disable" do
- key = user_project.deploy_keys_projects.find_by(deploy_key_id: params[:key_id])
- key.destroy
-
- present key.deploy_key, with: Entities::SSHKey
- end
-
desc 'Delete deploy key for a project' do
success Key
end
@@ -115,11 +101,9 @@ module API
end
delete ":id/deploy_keys/:key_id" do
key = user_project.deploy_keys_projects.find_by(deploy_key_id: params[:key_id])
- if key
- key.destroy
- else
- not_found!('Deploy Key')
- end
+ not_found!('Deploy Key') unless key
+
+ key.destroy
end
end
end