Merge branch 'api-remove-deploy-key-disable' into 'master'

API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`

Closes #28286

See merge request !9366

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