No need for the debugger
Revert "Don't allocate new strings in compiled attribute methods"

This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89.
1.9 hash syntax changes to docs
Make sure that RAILS_ENV is set when accessing Rails.env

Fixes #8025
Merge pull request #8026 from steveklabnik/issue_8025

Make sure that RAILS_ENV is set when accessing Rails.env
Small change to remove warning unused variable.
Merge pull request #8092 from arunagw/warning_removed_unused_var

Small change to remove warning unused variable.
Kernel#capture replaced by version which can catch output from subprocesses
Add test to ensure data attributes are properly escaped with tag helpers

Closes #8091
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now appends).

Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value.
Also test for `BestStandardsSupport` middleware added.
Merge pull request #8093 from nikitug/keep_app_x_ua_compatible

Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
This is comment for singular association.
Fix issue with collection associations and first(n)/last(n)

When calling first(n) or last(n) in a collection, Active Record was
improperly trying to set the inverse of instance in case that option
existed. This change was introduced by
fdf4eae506fa9895e831f569bed3c4aa6a999a22.

In such cases we don't need to do that "manually", since the way
collection will be loaded will already handle that, so we just skip
setting the inverse association when any argument is given to
first(n)/last(n).

The test included ensures that these scenarios will have the inverse of
instance set properly.

Fixes #8087, Closes #8094.

Squashed cherry-pick from d37d40b and c368b66.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
memoize calculated ip without additional variable

There is no need in additional `@calculated_ip` instance variable.
Merge pull request #8019 from lest/patch-1

memoize calculated ip without additional variable
Fixed timezone mapping of Solomon Islands.

Fixes #8095.

For reference, here is the discussion about the mapping being
incorrect:
http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html
Merge pull request #8097 from steveklabnik/issue_8095

Fixed mapping of Solomon Islands.
Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing
changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added introduced a bug when you have a shorthand route
inside a nested namespace.

See
https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1
Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci skip]"

This reverts commit cd17ee5598411728747011566abf6779166be9d3.

Reason: Let's note that this is discouraged, not remove the docs

[ci skip]
Revert "Updated activerecord test comments to new hash syntax"

This reverts commit 3b89052014c2bf3b8fbbcfb93f657a17dd7e7ca3.

Reason: changes made to a test, albeit in commented lines - non-uniform
change.

[ci skip]