summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-19 21:46:00 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-19 21:46:00 +0000
commit9617c274ab301e4d2401b2d9a179f40649259d3c (patch)
tree5473d83357f6c791b52b30a158c1e93d4baba2f4
parent6521ac73499062c8d43394ece7bf4b7fd9865d2f (diff)
parent97b5e49d30d8ed8090a6de45be335da9458f5d34 (diff)
downloadgitlab-ce-9617c274ab301e4d2401b2d9a179f40649259d3c.tar.gz
Merge branch 'issue_15390' into 'master'
Fix javascript errors with invalid json because of commas fixes #15390 See merge request !3827
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 55d7a38cce2..03a615d191c 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -151,6 +151,6 @@
:javascript
new MilestoneSelect('{"namespace":"#{@project.namespace.path}","path":"#{@project.path}"}');
new LabelsSelect();
- new IssuableContext('#{current_user.to_json(only: [:username, :id, :name])}');
+ new IssuableContext('#{escape_javascript(current_user.to_json(only: [:username, :id, :name]))}');
new Subscription('.subscription')
new Sidebar();