Making test accurately reflect what is going on in the schema migrations test
Merge pull request #7371 from csmuc/fix_dup_validation_errors

Dup'ed ActiveRecord objects may not share the errors object
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/dup_test.rb
Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951

`ENV['RAILS_ENV']` is not defined unless explicitly specified on the
command line when running `rake db:structure:load`. This patch lets
the rake task retrieve the environment from `Rails.env` which defaults
to "development".
active_model/validations requires necessary files to run
Merge pull request #7989 from senny/backport_7969

backport: active_model/validations requires necessary files to run
Require ActionController::Railtie in the default middleware stack.

This will make possible to do a frameworkless initialization since the
the default middleware stack is self contained.
Merge pull request #7986 from Grandrath/patch-2

Fix behavior of `rake db:structure:load` for 3.2.8
frozen state should be restored after txn is aborted
Adding a missing parenthesis in the doc of String#parameterize.
Merge pull request #8022 from GRoguelon/3-2-stable

Adding a missing parenthesis in the doc of String#parameterize.
Add test case to assets eager load
Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency

Fix AM::Serializers::Xml dependency
Respect children paths filter settings

E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
Removing JSON for other ruby

It's only required for 1.8 and for JRuby!
I was fixing a bug with JSON pure on 1.8.7
and I found that we have included json for other
1.8 > rubies also.
Merge pull request #8047 from arunagw/json_only_in_18

Removing JSON for other ruby
Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call

Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
	actionmailer/CHANGELOG.md
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