Change mimetype to Mime::JS if JSONP is used
fixed test case test_render_json_with_callback to use content_type application/javascript
JSON: Encode infinite or NaN floats as null to generate valid JSON.
When a route references a missing controller, raise ActionController::RoutingError with a clearer message
Fixes bug with schema dumper when using with Padrino.
From @dasch's recommendation.
Add a missing require for 'active_support/deprecation' in Module#deprecate
Merge branch 'master' of git://github.com/rails/rails
Not checking for nil is apparently a lot faster.
Fixed DataMapper namings in symbols and constants.
Remove j alias for ERB::Util.json_escape
postgresql adapter handles quoting of not a number (NaN) and Infinity
fix Helpers::DateHelper with :use_hidden - hide separators
Merge remote-tracking branch 'upstream/master'
Reset postgreSQL search path in db:test:clone_structure.

This patch resets the postgres search path in the structure.sql after
the structure is dumped in order to find schema_migrations table when
multiples schemas are used.

Fixes #945
gemspec assumes that user kept all generated files

This commit allows the user be lazy and not update
their gemspec's `files` directive after deleting
unwanted files from their generated Rails plugin.
Fix GH #4259. We must remove table_name_prefix and table_name_suffix, when we execute schema dumper.
Cache (FileStore) clear should keep .gitkeep
race_condition_ttl should be an integer
Refactor define_restrict_dependency_method using reflection