diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-17 14:55:43 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-17 14:55:43 +0100 |
commit | 9c7fffb6559facdcf8bbda680795f70d836293bf (patch) | |
tree | ec121310208197f6f50b953c999b0880083b45cd /app/controllers/projects/deploy_keys_controller.rb | |
parent | 409097bd7e0f5857cf0bc5462bd47484980ec787 (diff) | |
download | gitlab-ce-9c7fffb6559facdcf8bbda680795f70d836293bf.tar.gz |
Delete deploy key when last connection to a project is destroyed.
Diffstat (limited to 'app/controllers/projects/deploy_keys_controller.rb')
-rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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) |