Add test case to assets eager load
Respect children paths filter settings

E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
Merge pull request #7593 from veader/patch-1

Decode attributes pulled from URI.parse
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/connection_specification.rb
Fix the skip code.

Checking for the constant doesn't work
Make Active Record tests pass in isolation

Also remove the feature detecting for Ruby 1.9
Merge pull request #8053 from henrik/update_columns_with_primary_key

Unbreak update_column/update_columns for the primary key attribute.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/persistence.rb
	activerecord/test/cases/persistence_test.rb
Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

SQLite3Adapter#type_cast should not mutate arguments
Conflicts:
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
Deprecate Paths::Path#children which is unused now
Merge pull request #7587 from elia/fix-too-eager-loading

Should not eager_load app/assets
Revert "Deprecate Paths::Path#children which is unused now"

This reverts commit f7de647f2cd099ecf6434fa4a0db1ec297f1c32d.

We can't deprecate things in stable branches. I didn't not realized that
the pull request was for 3-2-stable
Add 3.2.9 section in ARes CHANGELOG

[ci skip]
Bump to 3.2.9.rc1
fixed support for DATABASE_URL for rake db tasks

Backport for #7521

- added tests to confirm establish_connection uses DATABASE_URL and
  Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
  confirm correct behavior for these rake tasks.  (Removed
  establish_connection call from some tasks since in those cases
  the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
  removes hash values with empty strings from the config spec (e.g.
  to support connection to postgresql when no username is specified).
- updated ResolverTest to use current_adapter? to check the type of
  the current adapter.
Merge pull request #8009 from graceliu/3-2-fix_database_url_support

fixed support for DATABASE_URL for rake db tasks
Fix bug when Column is trying to type cast boolean values to integer.

This can occur if the user is using :integer columns to store boolean
values. Now we are handling the boolean values but it still raises if
the value can't type cast to integer and is not a boolean. See #7509.

Fixes #8067.
Fix typo :bomb: [ci skip]
Add CHANGELOG entry to #8032 fix

e6b41845efe2252fe7de6882e355c31f93c65cc3 fixes that issue too.

[ci skip]
Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables"

This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression related with shoulda-matchers, since it
is expecting the instance variable @layouts

See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74

This will introduce back #7459 but this stable release will be backward compatible.
Related with #8068.
Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"

This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression since people were relying on this buggy behavior.
This will introduce back #3849 but we will be backward compatible in
stable release.

Fixes #8068.
Fix ActiveRecord#update_column return value