summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-04-06 00:07:36 +0200
committerMayra Cabrera <mcabrera@gitlab.com>2018-04-06 21:20:16 -0500
commit2c6c61815edada16c4477c938209c24c647e1798 (patch)
tree1d896b8ac1c5160b33116bc6d60e785df51cce79 /app/controllers/projects/settings
parent6b2954ec8a2e17c913872c32386cb2b08f2db1c2 (diff)
downloadgitlab-ce-2c6c61815edada16c4477c938209c24c647e1798.tar.gz
Get rid of Redis when dealing with deploy tokens
We use controller actions to pass a newly created token and errors
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r--app/controllers/projects/settings/repository_controller.rb28
1 files changed, 23 insertions, 5 deletions
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index b6b8963948c..c085870dacd 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -4,14 +4,30 @@ module Projects
before_action :authorize_admin_project!
def show
+ render_show
+ end
+
+ def create_deploy_token
+ @new_deploy_token = DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute
+
+ if @new_deploy_token.valid?
+ flash[:notice] = 'Your new project deploy token has been created.'
+ end
+
+ render_show
+ end
+
+ private
+
+ def render_show
@deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user)
@deploy_tokens = DeployTokensPresenter.new(@project.deploy_tokens.active, current_user: current_user, project: project)
define_deploy_token
define_protected_refs
- end
- private
+ render 'show'
+ end
def define_protected_refs
@protected_branches = @project.protected_branches.order(:name).page(params[:page])
@@ -55,9 +71,11 @@ module Projects
end
def define_deploy_token
- attributes = @deploy_tokens.attributes_deploy_token
- @deploy_token = DeployToken.new(attributes)
- @deploy_token.valid? unless attributes.empty?
+ @new_deploy_token ||= DeployToken.new
+ end
+
+ def deploy_token_params
+ params.require(:deploy_token).permit(:name, :expires_at, :read_repository, :read_registry)
end
end
end