Label description and Label row

- Add label description
- Show label row when filtering issues or merge requests by label

2 files changed, 5 insertions, 9 deletions

diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index 5ce2a7b985d..d63d3a3ec20 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -12,6 +12,10 @@
     .col-sm-10
       = f.text_field :title, class: "form-control js-quick-submit", required: true, autofocus: 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/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index b70a9fc9fe5..3d9118892ff 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,10 +1,2 @@
 %li{id: dom_id(label)}
-  = link_to_label(label)
-  .pull-right
-    %strong.append-right-20
-      = link_to_label(label) do
-        = pluralize label.open_issues_count, 'open issue'
-
-    - if can? current_user, :admin_label, @project
-      = link_to 'Edit', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm'
-      = link_to 'Delete', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"}
+  = render "shared/label_row", label: label, editable: true