Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector"

This reverts commit ae68fc3864e99ab43c18fd12577744e1583f6b64, reversing
changes made to 0262a18c7b0ab6f60fee842b3007388f9ffeb0fa.

See here: https://github.com/rails/rails/pull/8499#issuecomment-11356417
Revert "Fix failing test in railties"

This reverts commit 6bdc04624dcc0f45aab93af42d00224f67da36d5.

This has been reverted because https://github.com/rails/rails/commit/8554537e48d6ed18ef08cb3ac0a9da96ac3c5cd6
Merge pull request #8514 from mmb/filter_blob

Do not log the binding values for binary columns.
Convert changelogs to 1.9 hash style and fix some formatting [ci skip]
Skip binary data with binds test for mysql2, fix build

Mysql2 doesn't support binds, which means no binds payload is set when
logging, so the logic to render binary data differently here doesn't work.

Introduced in 99d142a9375f9ba1960863b3cc745265aa9a14df.
Remove unicode character encoding from ActiveSupport::JSON.encode

The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
not in the Basic Multilingual Plane.  It is possible to escape them
for json using the weird encoding scheme of a twelve-character
sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
"\u270e\u263a") but this wasn't properly handled in the escaping code.
Since raw UTF-8 is allowed in json, it was decided to simply pass
through the raw bytes rather than attempt to escape them.
AS::BasicObject can be inherited from
Revert "Add quotes to Numeric Passwords to force string(Postgres)"

This reverts commit 6e72099a382c9731c7b40aa1b10237318e31ac92.

Reason: Feel that this isn't the right place.
Revert "Add quotes to Numeric Passwords to force string(MySql)"

This reverts commit e5f8b2be64a74ce05e7c8b873d3e795e7bc68df5.
Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"

This reverts commit db9b619f2851d7aeef9b239f6c19d0076faf5909.
Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"

This reverts commit 2f0311d79af01dc59ab3bd95cd6a56511258f917.
Revert "Add quotes to Numeric Passwords to force string(sqlserver)"

This reverts commit d1e70cb7b410f5151b08af9b38b2d6d80c1c61c2.
bullets have fullstops too [ci skip]
copy editing [ci skip]
Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	railties/lib/rails/info_controller.rb
make an editing pass through the upgrading guide [ci skip]
Remove blank lines from generated Gemfile

Introduced by 059bdc3415b0f1fb436c56a399a41b90fe3e87f0
Merge pull request #8519 from rubys/master

 Remove blank lines from generated Gemfile
Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the  absence of attributes.
Add `ActiveModel::Errors#add_on_present` method. Adds error messages to present attributes.
Merge pull request #8518 from rwz/inheritable-basic-object

Properly deprecate AS::BasicObject without breaking subclasses of it