Fix mistake in assertion about content of permanent cookie

Add html_escape note to CHANGELOG

Thanks to Marek Labos & Nethemba

CVE-2012-3465

Introduce default_headers. closes #6311 #6515

Naming helpers should first check if passed object responds to model_name

Fix only-once stub logic.

Didn't fail the test because adapter#query happens to
not call raw connection's #query, but don't want to count
on that and have a fragile test.

Allow data attributes to be set as a first-level option for form_for, so you can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*

Fix just-plain-wrongness of psql auto-reconnect test.

We recommend the use of Unobtrusive JavaScript instead. For example:

  link_to "Greeting", "#", :class => "nav_link"

  $(function() {
    $('.nav_link').click(function() {
      // Some complex code

      return false;
    });
  });

or

  link_to "Greeting", '#', onclick: "alert('Hello world!'); return false", class: "nav_link"

for simple cases.

This reverts commit 3acdd652.

Observers are no longer important enough to get this configuration option called out at the top level

Reason: ActiveSupport::JSON::Variable is not used anymore internally. It
was deprecated in 3-2-stable but we reverted all the deprecation for
point releases.

See #6536 and #6546.
Conflicts:
	activesupport/lib/active_support/json/variable.rb

Full test requiring manual intervention was fine, but
w/ simulated disconnect, assertion was backward & still
passing. Was several kinds of wrong.

Reverting because it feels backward to specify a delivery to not
be performed while the e-mail is being composed. It is simpler (and
makes more sense) to delegate the responsibility to the calling code.

Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of what this makes ERB files look like.

This reverts commit 46b8bcee, reversing
changes made to 2f58795e.

Revert "The application generator generates `public/humans.txt` with some basic data". I dont consider this something most people is going to want most of the time. If you want to add it in your own app, knock yourself out. But it doesnt belong in Rails imo

Restore "%" ERb/Erubis Trim Mode

Restoring the '%' trim mode for ERb templates, allowing for a leading percent sign on a line to indicate non-inserted Ruby code.

Do not include application.js if it doesn't exists