summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-09-06 17:31:08 +0100
committerJacob Schatz <jschatz1@gmail.com>2016-10-13 20:39:04 -0400
commitef5a76f68a89b9bee9070800ceb19753d0c602fe (patch)
tree4fc21fe4447bddb5b517a031e3b26639c65c6e74
parent86d59657fc8ba0f96b8f957b1298a34144e060f9 (diff)
downloadgitlab-ce-ef5a76f68a89b9bee9070800ceb19753d0c602fe.tar.gz
Fixed rendering of HTML strings
-rw-r--r--app/assets/javascripts/gl_dropdown.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
index c0cb70cb427..06b31b9b24b 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -503,7 +503,13 @@
var ul = document.createElement('ul');
for (var i = 0; i < html.length; i++) {
- ul.appendChild(html[i]);
+ var el = html[i];
+
+ if (typeof el === 'string') {
+ ul.innerHTML += el;
+ } else {
+ ul.appendChild(el);
+ }
}
return ul;