summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorSam Bigelow <sbigelow@gitlab.com>2019-04-24 14:09:36 +0000
committerPhil Hughes <me@iamphill.com>2019-04-24 14:09:36 +0000
commit699957ef59a516171ee6aba25e3ff6c8bb71b6bb (patch)
tree820a4723eeab38b2510577f3310a672ff5376f05 /app/helpers
parent27a964078bd6cd5aab5f7146d3cd8ceadc6de794 (diff)
downloadgitlab-ce-699957ef59a516171ee6aba25e3ff6c8bb71b6bb.tar.gz
Resolve "Merge Request Popover is not working on the To Do page"
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/markup_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index be4fc2531ae..ad77f99fe44 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -83,7 +83,8 @@ module MarkupHelper
text = sanitize(
text,
tags: tags,
- attributes: Rails::Html::WhiteListSanitizer.allowed_attributes + ['style', 'data-src', 'data-name', 'data-unicode-version']
+ attributes: Rails::Html::WhiteListSanitizer.allowed_attributes +
+ %w(style data-src data-name data-unicode-version data-iid data-project-path data-mr-title)
)
# since <img> tags are stripped, this can leave empty <a> tags hanging around