diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-18 22:50:15 +0300 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-06 23:51:18 +0300 |
commit | 085d5eae8a13f6ac032321a601916eb6493045b8 (patch) | |
tree | 5e4b2e15aa6107eaaff0ebb4cf79f90c9fd729ef /app/controllers/projects/settings | |
parent | d00e00ad66ae8cecd50899762503919289217453 (diff) |
Added private methods to initialize variables in the ci_cd_pipelines_controller
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/ci_cd_pipelines_controller.rb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/app/controllers/projects/settings/ci_cd_pipelines_controller.rb b/app/controllers/projects/settings/ci_cd_pipelines_controller.rb index f570215af04..f9707d2df41 100644 --- a/app/controllers/projects/settings/ci_cd_pipelines_controller.rb +++ b/app/controllers/projects/settings/ci_cd_pipelines_controller.rb @@ -4,18 +4,29 @@ module Projects before_action :authorize_admin_pipeline! def show - # runners + define_runners_variables + # variables + @variable = Ci::Variable.new + define_triggers_variables + define_badges_variables + end + + private + + def define_runners_variables @project_runners = @project.runners.ordered @assignable_runners = current_user.ci_authorized_runners. assignable_for(project).ordered.page(params[:page]).per(20) @shared_runners = Ci::Runner.shared.active @shared_runners_count = @shared_runners.count(:all) - # variables - @variable = Ci::Variable.new - # triggers + end + + def define_triggers_variables @triggers = @project.triggers @trigger = Ci::Trigger.new - # pipelines + end + + def define_badges_variables @ref = params[:ref] || @project.default_branch || 'master' @badges = [Gitlab::Badge::Build::Status, |