Merge branch 'issue_15390' into 'master'

Fix javascript errors with invalid json because of commas

fixes #15390 

See merge request !3827
This commit is contained in:
Robert Speicher 2016-04-19 21:46:00 +00:00
commit 9617c274ab
1 changed files with 1 additions and 1 deletions

View File

@ -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();