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:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-23 17:45:25 +0300
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-23 17:49:24 +0300
commite0d2f249b4884f9525c44119680bf804e8a7ff20 (patch)
tree7f8598e57a29aa263a6f4d80b3ae6b2f473abffd /app/controllers/projects/deploy_keys_controller.rb
parentd576fd82333c79b3f056f26f79e85c0eceb5704b (diff)
Return 404 if deploy key cannot be found in Projects::DeployKeysController#disable
Closes #29633
Diffstat (limited to 'app/controllers/projects/deploy_keys_controller.rb')
-rw-r--r--app/controllers/projects/deploy_keys_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 1502b734f37..d0c44e297e3 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -31,8 +31,10 @@ class Projects::DeployKeysController < Projects::ApplicationController
end
def disable
- @project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy
+ deploy_key_project = @project.deploy_keys_projects.find_by(deploy_key_id: params[:id])
+ return render_404 unless deploy_key_project
+ deploy_key_project.destroy!
redirect_to_repository_settings(@project)
end