-
- Downloads
Merge branch 'move-protected-branches' into 'master'
Move protected branches to Project settings page Because all settings should be in one place
Showing
- app/controllers/projects/branches_controller.rb 3 additions, 1 deletionapp/controllers/projects/branches_controller.rb
- app/controllers/projects/protected_branches_controller.rb 2 additions, 2 deletionsapp/controllers/projects/protected_branches_controller.rb
- app/helpers/tab_helper.rb 1 addition, 1 deletionapp/helpers/tab_helper.rb
- app/models/repository.rb 15 additions, 6 deletionsapp/models/repository.rb
- app/views/layouts/nav/_project.html.haml 1 addition, 1 deletionapp/views/layouts/nav/_project.html.haml
- app/views/projects/_settings_nav.html.haml 4 additions, 0 deletionsapp/views/projects/_settings_nav.html.haml
- app/views/projects/branches/_branch.html.haml 3 additions, 7 deletionsapp/views/projects/branches/_branch.html.haml
- app/views/projects/branches/_filter.html.haml 0 additions, 27 deletionsapp/views/projects/branches/_filter.html.haml
- app/views/projects/branches/index.html.haml 30 additions, 9 deletionsapp/views/projects/branches/index.html.haml
- app/views/projects/branches/recent.html.haml 0 additions, 8 deletionsapp/views/projects/branches/recent.html.haml
- app/views/projects/commits/_head.html.haml 2 additions, 2 deletionsapp/views/projects/commits/_head.html.haml
- app/views/projects/protected_branches/index.html.haml 47 additions, 49 deletionsapp/views/projects/protected_branches/index.html.haml
- config/routes.rb 1 addition, 6 deletionsconfig/routes.rb
Loading
Please register or sign in to comment