Fix Baseclass becomes! subclass.
[ci skip] Mention the change in nil handling for serialized attributes
in "Upgrading from Rails 3.2 to Rails 4.0"
Fix regression on after_commit in nested transactions.

after_commit should not run in nested transactions, however they should
run once the outermost transaction gets committed. This patch fixes the
problem copying the records from the Savepoint to its parent. So the
RealTransaction will have all records that needs to run callbacks on it.

[fixes #16425]
Merge pull request #16432 from arthurnn/after_commit_run_on_top_level_trans

Fix regression on after_commit in nested transactions.
Merge pull request #16489 from tomkadwill/updating_options_to_new_style

[ci skip] Updated where scope documentation to conform to new style
Fixed AR::Relation#where edge case with Hash and other Relation

Example:

  Author.where(posts: { author_id: Author.where(country_id: 1) }).joins(:posts)

Conflicts:
	activerecord/lib/active_record/relation/query_methods.rb
Merge pull request #16403 from Peeja/baseclass-becomes-subclass-for-4-1

Backport "Fix Baseclass becomes! subclass." for 4.1

Conflicts:
	activerecord/CHANGELOG.md
unify CHANGELOG format.
Merge pull request #16503 from bogdan/where-hash-nested-relation-4-1-stable

Fixed AR::Relation#where edge case with Hash and other Relation
Fixed link for in_place_editor [ci skip]

closes #16512
Point to rubygems instead of Rails GitHub. [ci skip]

The rails repository is not the official plugin anymore
Merge pull request #16458 from chancancode/ar_fix_reserved_inheritance

Fixed issue w/custom accessors + reserved name + inheritance

Conflicts:
	activerecord/CHANGELOG.md
Just like :pool, make sure :checkout_timeout and :dead_connection_timeout are numbers

Using #to_f instead of #to_i because they are specified in seconds instead of milliseconds
Check attributes passed to create_with and where

If the request parameters are passed to create_with and where they can
be used to do mass assignment when used in combination with
Relation#create.

Fixes CVE-2014-3514
Preparing for 4.1.5 release
Merge branch '4-1-5' into 4-1-stable

Conflicts:
	actionmailer/CHANGELOG.md
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
Merge pull request #16546 from aditya-kapoor/remove-broken-link

fix broken link to rails blog [ci skip]
Merge pull request #16542 from seamusabshere/numerify-pool-checkout-timeout-from-urls-4-1-stable

Make sure :checkout_timeout and :dead_connection_timeout are numbers
Make ActionMailer::Previews methods class methods.

Conflicts:
	actionmailer/CHANGELOG.md
Merge pull request #16349 from jmcnevin/master

Correctly determine if migration is needed.