-
- Downloads
Merge branch 'move-ci-settings' into 'master'
Move CI project settings page to CE project settings area
Signed-off-by: 
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1465
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/controllers/ci/projects_controller.rb 2 additions, 31 deletionsapp/controllers/ci/projects_controller.rb
- app/controllers/projects/application_controller.rb 1 addition, 1 deletionapp/controllers/projects/application_controller.rb
- app/controllers/projects/ci_settings_controller.rb 36 additions, 0 deletionsapp/controllers/projects/ci_settings_controller.rb
- app/helpers/ci/gitlab_helper.rb 2 additions, 2 deletionsapp/helpers/ci/gitlab_helper.rb
- app/views/layouts/ci/_nav_project.html.haml 0 additions, 6 deletionsapp/views/layouts/ci/_nav_project.html.haml
- app/views/layouts/nav/_project_settings.html.haml 5 additions, 0 deletionsapp/views/layouts/nav/_project_settings.html.haml
- app/views/projects/ci_settings/_form.html.haml 12 additions, 9 deletionsapp/views/projects/ci_settings/_form.html.haml
- app/views/projects/ci_settings/edit.html.haml 4 additions, 4 deletionsapp/views/projects/ci_settings/edit.html.haml
- config/routes.rb 1 addition, 0 deletionsconfig/routes.rb
- spec/features/ci/projects_spec.rb 0 additions, 18 deletionsspec/features/ci/projects_spec.rb
- spec/features/ci_settings_spec.rb 22 additions, 0 deletionsspec/features/ci_settings_spec.rb
Loading
Please register or sign in to comment