Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
the ERB scaffold generator.

We are trying to teach the data attributes as best practices and
`:confirm` will be deprecated in 4.0.
Fix ActiveSupport integration with Mocha > 0.12.1

Mocha 0.12.2 renames the Integration module to
MonkeyPatching. This breaks the code Rails uses
to retrieve the assertion counter from Mocha.
Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237
Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
the ERB scaffold generator.

We are trying to teach the data attributes as best practices and
`:confirm` will be deprecated in 4.0.
html_escape should escape single quotes

https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/form_tag_helper_test.rb
	actionpack/test/template/text_helper_test.rb
	actionpack/test/template/url_helper_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
html_escape should escape single quotes

https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/form_tag_helper_test.rb
	actionpack/test/template/text_helper_test.rb
	actionpack/test/template/url_helper_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
Fix html_escape with Ruby 1.8
Fix html_escape with Ruby 1.8
More `:rails_env` cleanup.

`Rails.env` already use development if ENV["RAILS_ENV"] is not present.
More `:rails_env` cleanup.

`Rails.env` already use development if ENV["RAILS_ENV"] is not present.
Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores

Support cookie jar options for all cookie stores
Add CHANGELOG entry
Bump to 3.2.8.rc2
Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores"

This reverts commit 393c652cf63875f2728c04d47b34b2d6ae908186.

This commit was supposed to fix a bug but it add more failures.
Merge pull request #7140 from seamusabshere/patch-1

Make sure :environment task is executed before db:schema:load or
db:structure:load

Conflicts:
	activerecord/CHANGELOG.md
Do not include application.js if it doesn't exists

Rails were including 'application.js' to the pack when using
`javascript_include_tag :all` even there's no application.js in the
public directory.
Rearrange example output of javascript_include_tag
Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fix

Do not include application.js if it doesn't exists
Merge pull request #7167 from route/missed_extend

Missed extend for eager_autoload

This backport is trying to fix a bug with eager load
ActiveRecord::Associations modules
Merge pull request #5872 from evtuhovich/prepared_statement_fix

Remove prepared statement from system query in postgresql adapter
Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb