diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-23 18:51:16 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-06 14:51:18 -0600 |
| commit | 60045195462562c985c6a3a70c899adfe04be2f5 (patch) | |
| tree | 083e0c291c832acf7f472d052aa2414064ba1f28 /app | |
| parent | 8ffe586b778b905f57382485140efea4c3dcad93 (diff) | |
| download | gitlab-ce-60045195462562c985c6a3a70c899adfe04be2f5.tar.gz | |
Fixed tests, renamed files and methods
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 2 | ||||
| -rw-r--r-- | app/controllers/projects/runners_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 4 | ||||
| -rw-r--r-- | app/helpers/gitlab_routing_helper.rb | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6 index a023ae30954..213d9608479 100644 --- a/app/assets/javascripts/dispatcher.js.es6 +++ b/app/assets/javascripts/dispatcher.js.es6 @@ -259,7 +259,7 @@ new gl.ProtectedBranchCreate(); new gl.ProtectedBranchEditList(); break; - case 'projects:ci_cd_pipelines:show': + case 'projects:ci_cd:show': new gl.ProjectVariables(); break; case 'ci:lints:create': diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb index 9aa61a18f23..74c54037ba9 100644 --- a/app/controllers/projects/runners_controller.rb +++ b/app/controllers/projects/runners_controller.rb @@ -4,6 +4,10 @@ class Projects::RunnersController < Projects::ApplicationController layout 'project_settings' + def index + redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) + end + def edit end diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 8d33238aebd..6f009d61950 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -5,7 +5,7 @@ module Projects def show define_runners_variables - define_project_variables_variables + define_secret_variables define_triggers_variables define_badges_variables end @@ -20,7 +20,7 @@ module Projects @shared_runners_count = @shared_runners.count(:all) end - def define_project_variables_variables + def define_secret_variables @variable = Ci::Variable.new end diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb index d00c8865e0b..f16a63e2178 100644 --- a/app/helpers/gitlab_routing_helper.rb +++ b/app/helpers/gitlab_routing_helper.rb @@ -215,4 +215,8 @@ module GitlabRoutingHelper def project_settings_members_path(project, *args) namespace_project_settings_members_path(project.namespace, project, *args) end + + def project_settings_ci_cd_path(project, *args) + namespace_project_settings_ci_cd_path(project.namespace, project, *args) + end end |