summaryrefslogtreecommitdiff
path: root/app/views/admin/labels
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-10-06 23:01:42 +0100
committerNick Thomas <nick@gitlab.com>2016-10-07 02:54:26 +0100
commit9920551536bb4f78dffeaaf3a194b92f54c34a47 (patch)
treedad5b2d5f1b725e66d29d355c5095b6899546427 /app/views/admin/labels
parentdd159a750b294ee89cb8a4143284ff9788b639fc (diff)
downloadgitlab-ce-9920551536bb4f78dffeaaf3a194b92f54c34a47.tar.gz
Enable CacheMarkdownField for the remaining models
This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
Diffstat (limited to 'app/views/admin/labels')
-rw-r--r--app/views/admin/labels/_label.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/labels/_label.html.haml b/app/views/admin/labels/_label.html.haml
index f417b2e44a4..be224d66855 100644
--- a/app/views/admin/labels/_label.html.haml
+++ b/app/views/admin/labels/_label.html.haml
@@ -1,7 +1,7 @@
%li{id: dom_id(label)}
.label-row
= render_colored_label(label, tooltip: false)
- = markdown(label.description, pipeline: :single_line)
+ = markdown_field(label, :description)
.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?"}