Skip to content

Add label description and show label row when filtering issues or merge requests by label

username-removed-397603 requested to merge visibletrap/gitlab-ce:label into master

This MR is an attempt to address #13498 (closed). It contains 2 major changes

Add description to Label model

  • Add description to label forms both create and update for each project and for admin Screen_Shot_2016-02-17_at_9.10.40_PM

  • Add description to Label list page for project and admin as well. Markdown is supported for the description. Screen_Shot_2016-02-17_at_9.26.04_PM

Add label row under issue/merge_request filter when filter by label

Screen_Shot_2016-02-17_at_9.23.37_PM

Note that there's new partial created for this change at shared/_label_row. I have made a change to CSS class here https://gitlab.com/visibletrap/gitlab-ce/commit/2e81b1558bb02da5eacd24484a665a48e8a1cece?view=inline#8c78bd7ec6ae6fee9af2f2c6844043e816812e4e_13_12. This effects 2 files

$ grep manage-labels-list ./app -R
./app/views/admin/labels/index.html.haml:    %ul.bordered-list.manage-labels-list
./app/views/projects/labels/index.html.haml:    %ul.content-list.manage-labels-list
$ grep label-row ./app -R
./app/assets/stylesheets/pages/labels.scss:.label-row {
./app/views/admin/labels/_label.html.haml:  .label-row
./app/views/shared/_label_row.html.haml:.label-row

Merge request reports