Support data: url scheme in asset paths.
Added therubyrhino to default Gemfile under JRuby
Update CHANGELOG with the addition of therubyrhino
Make the Rack::SSL middleware configurable
Merge pull request #3710 from dmathieu/cherry-pick-ssl-config

Cherry pick ssl config
caching 'false' properly
Add config.active_record.identity_map to the configuration guide.
Small docs fix in Active Model callbacks module
Fix missing single quote that was messing up syntax highlighting.
what's -> that's
Bump Mysql2!
If the table behind has no primary key, do not ask again and just return nil.

Conflicts:

	activerecord/test/cases/attribute_methods_test.rb
don't alter global state in test
Leave default_asset_host_protocol unset

When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)

Signed-off-by: José Valim <jose.valim@gmail.com>
Update CHANGELOG.
[docs] removed last-modifed line from examples

This is no longer best-practice.

ref:
http://stackoverflow.com/questions/8344186/rails-3-1-on-apache-pagespeed-says-specify-cache-validator-when-using-asset-p/8348385#8348385
typo in the performance testing rails guide
Restore performance of ERB::Util.html_escape

Revert html_escape to do a single gsub again, but add the "n" flag (no
language, i.e. not multi-byte) to protect against XSS via invalid utf8

Signed-off-by: José Valim <jose.valim@gmail.com>
Avoid postgres 9.X syntax
Enable postgres on the CI :heart: :beer: :sparkles: