-
- Downloads
Merge branch 'labels-placement' into 'master'
Move Labels and Milestones as sub tab to Issues/MR ## What does this MR do? UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. ## Why was this MR needed? To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18368 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - not needed - [x] API support added - not needed - [x] Tests - [x] Added for this feature/bug - changed existing tests to match new behaviour - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) cc @jschatz1 @annabeldunstone @skyruler See merge request !4592
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/views/layouts/nav/_project.html.haml 2 additions, 16 deletionsapp/views/layouts/nav/_project.html.haml
- app/views/projects/issues/_head.html.haml 25 additions, 0 deletionsapp/views/projects/issues/_head.html.haml
- app/views/projects/issues/index.html.haml 18 additions, 15 deletionsapp/views/projects/issues/index.html.haml
- app/views/projects/labels/index.html.haml 33 additions, 30 deletionsapp/views/projects/labels/index.html.haml
- app/views/projects/merge_requests/_head.html.haml 0 additions, 5 deletionsapp/views/projects/merge_requests/_head.html.haml
- app/views/projects/merge_requests/index.html.haml 14 additions, 12 deletionsapp/views/projects/merge_requests/index.html.haml
- app/views/projects/milestones/index.html.haml 16 additions, 13 deletionsapp/views/projects/milestones/index.html.haml
- features/project/active_tab.feature 8 additions, 4 deletionsfeatures/project/active_tab.feature
- features/steps/project/active_tab.rb 8 additions, 8 deletionsfeatures/steps/project/active_tab.rb
- features/steps/shared/active_tab.rb 2 additions, 2 deletionsfeatures/steps/shared/active_tab.rb
Loading
Please register or sign in to comment