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:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-02-22 00:37:00 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-03-06 18:47:44 +0300
commita29517dd0c6515121a2f42e08ad011415a3d8618 (patch)
tree93977c5a003a378749a3de252336500a732771d6 /app/controllers/projects/deploy_keys_controller.rb
parent336b818bcbcb070968f825f6a426e046a457d556 (diff)
Added tests for the repository_controller and repository_helper
Added specs for the deploy_keys_presenter and added a new method in the presenter called #key_available? Fixed some minor UX inconsistencies and added a concern to handle redirection
Diffstat (limited to 'app/controllers/projects/deploy_keys_controller.rb')
-rw-r--r--app/controllers/projects/deploy_keys_controller.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 0d60e782dfb..465757e07b1 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -1,4 +1,5 @@
class Projects::DeployKeysController < Projects::ApplicationController
+ include RedirectRequest
respond_to :html
# Authorize
@@ -7,32 +8,32 @@ class Projects::DeployKeysController < Projects::ApplicationController
layout "project_settings"
def index
- redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
+ redirect_to_repository_settings(@project)
end
def new
- redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
+ redirect_to_repository_settings(@project)
end
def create
@key = DeployKey.new(deploy_key_params.merge(user: current_user))
unless @key.valid? && @project.deploy_keys << @key
- flash[:alert] = @key.errors.full_messages.join(',').html_safe
+ flash[:alert] = @key.errors.full_messages.join(', ').html_safe
end
- redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
+ redirect_to_repository_settings(@project)
end
def enable
Projects::EnableDeployKeyService.new(@project, current_user, params).execute
- redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
+ redirect_to_repository_settings(@project)
end
def disable
@project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy
- redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
+ redirect_to_repository_settings(@project)
end
protected