Merge branch 'master' of https://github.com/OWASP/railsgoat

app/assets/javascripts/application.js

@@ -53,6 +53,10 @@ $("pre.javascript").snippet("javascript",{style:"rand01",transparent:true,showNu
 
 };
 
+function coerceToString(val) {
+  return String((val === null || val === undefined) ? '' : val);
+}
+
 var rAmp = /&/g,
      rLt = /</g,
      rGt = />/g,

config/application.rb

@@ -40,7 +40,7 @@ module Railsgoat
     config.filter_parameters += [:password]
 
     # Enable escaping HTML in JSON.
-    #config.active_support.escape_html_entities_in_json = false
+    #config.active_support.escape_html_entities_in_json = true
 
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,