From 9c7fffb6559facdcf8bbda680795f70d836293bf Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 17 Mar 2015 14:55:43 +0100 Subject: Delete deploy key when last connection to a project is destroyed. --- app/controllers/projects/deploy_keys_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/deploy_keys_controller.rb') diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index b7cc305899c..2ecde8381e7 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -37,7 +37,8 @@ class Projects::DeployKeysController < Projects::ApplicationController @key.destroy respond_to do |format| - format.html { redirect_to project_deploy_keys_url } + format.html { redirect_to namespace_project_deploy_keys_path(@project.namespace, + @project) } format.js { render nothing: true } end end @@ -50,7 +51,7 @@ class Projects::DeployKeysController < Projects::ApplicationController end def disable - @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy + @project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy redirect_to namespace_project_deploy_keys_path(@project.namespace, @project) -- cgit v1.2.1