summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-04-20 13:55:19 +0100
committerArinde Eniola <eniolaarinde1@gmail.com>2016-04-20 13:55:19 +0100
commita845252983e4a0346c17e1b058c388f4c23a547d (patch)
treede4b192e8b0614656b31273ff2a56688beee8c42 /app/views/shared
parentbea3484305af3f6a4e4a9ca8d2a7cbe1e2f7690a (diff)
downloadgitlab-ce-a845252983e4a0346c17e1b058c388f4c23a547d.tar.gz
get the multi filter labels feature to work on merge request, also escape characters in the templates to prevent xss attack
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/issuable/_filter.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 9dba3f522db..c14391ada0f 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -46,7 +46,7 @@
.filter-item.inline
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
- .gray-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels) }
+ .gray-content-block.second-block.filtered-labels
- if @labels
= render "shared/labels_row", labels: @labels