diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-19 21:46:00 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-20 10:48:22 +0200 |
| commit | 413ff5b3ceaf09922abe268008590ee5ca1e849d (patch) | |
| tree | c16b153d61361f09842ef85480ea8abf70593d42 | |
| parent | e2903f28e589d9b605c619c9208a2f5ca95e76af (diff) | |
| download | gitlab-ce-413ff5b3ceaf09922abe268008590ee5ca1e849d.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.haml | 2 |
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(); |