diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 18:09:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 18:09:07 +0000 |
commit | 1c8fa70f9d0818e2a82089c8643a6e455bca47fd (patch) | |
tree | f339f97de0425270bdd909e2f4d378927b6e0a18 /app/controllers/projects/settings | |
parent | 736d36d8597d0d1ec1b47644e6d091c3f4a78f45 (diff) | |
download | gitlab-ce-1c8fa70f9d0818e2a82089c8643a6e455bca47fd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 23 | ||||
-rw-r--r-- | app/controllers/projects/settings/repository_controller.rb | 20 |
2 files changed, 22 insertions, 21 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 5097b6b8c8c..ed42fb55223 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -6,7 +6,7 @@ module Projects before_action :authorize_admin_pipeline! before_action :define_variables before_action do - push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true) + push_frontend_feature_flag(:new_variables_ui, @project) end def show @@ -46,6 +46,16 @@ module Projects redirect_to namespace_project_settings_ci_cd_path end + def create_deploy_token + @new_deploy_token = Projects::DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute + + if @new_deploy_token.persisted? + flash.now[:notice] = s_('DeployTokens|Your new project deploy token has been created.') + end + + render 'show' + end + private def update_params @@ -64,6 +74,10 @@ module Projects end end + def deploy_token_params + params.require(:deploy_token).permit(:name, :expires_at, :read_repository, :read_registry, :username) + end + def run_autodevops_pipeline(service) return unless service.run_auto_devops_pipeline? @@ -83,6 +97,7 @@ module Projects def define_variables define_runners_variables define_ci_variables + define_deploy_token_variables define_triggers_variables define_badges_variables define_auto_devops_variables @@ -132,6 +147,12 @@ module Projects def define_auto_devops_variables @auto_devops = @project.auto_devops || ProjectAutoDevops.new end + + def define_deploy_token_variables + @deploy_tokens = @project.deploy_tokens.active + + @new_deploy_token = DeployToken.new + end end end end diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb index 63f5d5073a7..28db3024dc4 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -10,16 +10,6 @@ module Projects render_show end - def create_deploy_token - @new_deploy_token = DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute - - if @new_deploy_token.persisted? - flash.now[:notice] = s_('DeployTokens|Your new project deploy token has been created.') - end - - render_show - end - def cleanup cleanup_params = params.require(:project).permit(:bfg_object_map) result = Projects::UpdateService.new(project, current_user, cleanup_params).execute @@ -38,9 +28,7 @@ module Projects def render_show @deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user) - @deploy_tokens = @project.deploy_tokens.active - define_deploy_token define_protected_refs remote_mirror @@ -93,14 +81,6 @@ module Projects gon.push(protectable_branches_for_dropdown) gon.push(access_levels_options) end - - def define_deploy_token - @new_deploy_token ||= DeployToken.new - end - - def deploy_token_params - params.require(:deploy_token).permit(:name, :expires_at, :read_repository, :read_registry, :username) - end end end end |