Commit 9d713a8f authored by Ruben Davila's avatar Ruben Davila

Fix broken specs for DeployKeysController.

parent 1301572a
...@@ -29,14 +29,15 @@ class Projects::DeployKeysController < Projects::ApplicationController ...@@ -29,14 +29,15 @@ class Projects::DeployKeysController < Projects::ApplicationController
end end
def enable def enable
log_audit_event(@key.title, action: :create) load_key
Projects::EnableDeployKeyService.new(@project, current_user, params).execute Projects::EnableDeployKeyService.new(@project, current_user, params).execute
log_audit_event(@key.title, action: :create)
redirect_to namespace_project_deploy_keys_path(@project.namespace, @project) redirect_to namespace_project_deploy_keys_path(@project.namespace, @project)
end end
def disable def disable
@key = accessible_keys.find(params[:id]) load_key
@project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy @project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy
log_audit_event(@key.title, action: :destroy) log_audit_event(@key.title, action: :destroy)
...@@ -65,4 +66,8 @@ class Projects::DeployKeysController < Projects::ApplicationController ...@@ -65,4 +66,8 @@ class Projects::DeployKeysController < Projects::ApplicationController
AuditEventService.new(current_user, @project, options). AuditEventService.new(current_user, @project, options).
for_deploy_key(key_title).security_event for_deploy_key(key_title).security_event
end end
def load_key
@key ||= current_user.accessible_deploy_keys.find(params[:id])
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment