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-01-24 03:28:40 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-03-06 18:47:43 +0300
commit0b74ae849d3f87564e789673ecf67aa54ec7cd8a (patch)
tree2bf4220555d8953d16cbc378923f4edf8617bdb3 /app/controllers/projects/deploy_keys_controller.rb
parentc51d72036698c6d53602c58f09d5ddd3ed8d225b (diff)
Created the gear settings entry and created a way to initialize both sections with one controller
Changed views to partials, created the repository view, created a repository_helper to further aid the creation of variables across different controllers
Diffstat (limited to 'app/controllers/projects/deploy_keys_controller.rb')
-rw-r--r--app/controllers/projects/deploy_keys_controller.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index b094491e006..07410afd99a 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -7,12 +7,11 @@ class Projects::DeployKeysController < Projects::ApplicationController
layout "project_settings"
def index
- @key = DeployKey.new
- set_index_vars
+ redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
end
def new
- redirect_to namespace_project_deploy_keys_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
end
def create
@@ -20,7 +19,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
set_index_vars
if @key.valid? && @project.deploy_keys << @key
- redirect_to namespace_project_deploy_keys_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
else
render "index"
end
@@ -29,7 +28,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
def enable
Projects::EnableDeployKeyService.new(@project, current_user, params).execute
- redirect_to namespace_project_deploy_keys_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_repository_path(@project.namespace, @project)
end
def disable