summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2018-10-01 16:47:39 +0000
committerBob Van Landuyt <bob@gitlab.com>2018-10-01 16:47:39 +0000
commitbfd3062cd3479beedb327e8fed04767f52c5c135 (patch)
tree1e132d8661b319d11b31163ef3d9c8d2ab896606 /app/assets/javascripts/pages
parent1735088e7c5bf62a8f896a2b0e384964de83d118 (diff)
parent6d360c210d3d822fc266eecc04753481ae4bda70 (diff)
downloadgitlab-ce-bfd3062cd3479beedb327e8fed04767f52c5c135.tar.gz
Merge branch 'security-acet-issue-details' into 'master'
[master] Fix XSS on Issue details page. See merge request gitlab/gitlabhq!2468
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r--app/assets/javascripts/pages/projects/issues/show.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index 74b3a515e84..ef65196872c 100644
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -3,9 +3,10 @@ import Issue from '~/issue';
import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
import ZenMode from '~/zen_mode';
import '~/notes/index';
-import '~/issue_show/index';
+import initIssueableApp from '~/issue_show';
export default function () {
+ initIssueableApp();
new Issue(); // eslint-disable-line no-new
new ShortcutsIssuable(); // eslint-disable-line no-new
new ZenMode(); // eslint-disable-line no-new