diff options
author | Tap <visibletrap@gmail.com> | 2016-02-17 21:52:12 +0800 |
---|---|---|
committer | Tap <visibletrap@gmail.com> | 2016-02-17 21:52:12 +0800 |
commit | 2e81b1558bb02da5eacd24484a665a48e8a1cece (patch) | |
tree | 9843854846e2616075d7dbcaf0ca1527cb7de9a4 /app/views/admin/labels | |
parent | 943bed68bc42d02246ddea63a25432d3aba709e7 (diff) | |
download | gitlab-ce-2e81b1558bb02da5eacd24484a665a48e8a1cece.tar.gz |
Label description and Label row
- Add label description
- Show label row when filtering issues or merge requests by label
Diffstat (limited to 'app/views/admin/labels')
-rw-r--r-- | app/views/admin/labels/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/labels/_label.html.haml | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index eaa94ed9e36..8c6b389bf15 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -12,6 +12,10 @@ .col-sm-10 = f.text_field :title, class: "form-control", required: true .form-group + = f.label :description, class: 'control-label' + .col-sm-10 + = f.text_field :description, class: "form-control js-quick-submit" + .form-group = f.label :color, "Background color", class: 'control-label' .col-sm-10 .input-group diff --git a/app/views/admin/labels/_label.html.haml b/app/views/admin/labels/_label.html.haml index e3ccbf6c3a8..5736a301910 100644 --- a/app/views/admin/labels/_label.html.haml +++ b/app/views/admin/labels/_label.html.haml @@ -1,5 +1,7 @@ %li{id: dom_id(label)} - = render_colored_label(label) - .pull-right - = link_to 'Edit', edit_admin_label_path(label), class: 'btn btn-sm' - = link_to 'Delete', admin_label_path(label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Delete this label? Are you sure?"} + .label-row + = render_colored_label(label) + = markdown(label.description, pipeline: :single_line) + .pull-right + = link_to 'Edit', edit_admin_label_path(label), class: 'btn btn-sm' + = link_to 'Delete', admin_label_path(label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Delete this label? Are you sure?"} |