The option is called encode_big_decimal_as_string [ci skip]
Merge pull request #12906 from chancancode/use_standard_json_big_decimal_format-4-0-stable

(Doc fix) Backport ActiveSupport.encode_big_decimal_as_string doc fix to 4-0-stable [ci skip]
Merge pull request #12904 from sbagdat/patch-1

Change Relation#all to Relation#load [ci skip]
Merge pull request #12703 from makimoto/actionsupport-error-set_backtrace

Use set_backtrace instead of @backtrace in ActionView error
Conflicts:
	actionview/CHANGELOG.md
Merge pull request #12916 from petervandenabeele/typo_4_0_release_notes

[ci skip] typo in ArgumentError in 4_0_release_notes.md
Merge pull request #12918 from versioncontrol/rails-12866

Checks to see if the record contains the foreign_key to set the inverse automatically

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
rails new --edge should generate a edge version in the 4.0 family
Merge pull request #12970 from prathamesh-sonpatki/issue12885

Add positional information to eval call so that this information will be used in printing correct location where the exception occurred.

Closes #12885.
Use `SchemaStatements#initialize_schema_migrations_table` instead of `ActiveRecord::SchemaMigration.create_table`.
Merge pull request #12975 from sbagdat/fix-for-rake-routes

Fix for routes task
Conflicts:
	actionpack/CHANGELOG.md
	railties/test/application/rake_test.rb
Merge pull request #12996 from shreve/patch-2

Added a missing close parenthesis to i18n.md [ci skip]
Merge pull request #13012 from harrigan/master

Helper should be a module in Rails guides [ci skip]
sync example and documentation for strong_parameters hash whitelisting.

[ci skip]

This is a follow up to #12609 and integrates #12158.

Thanks @aspiers.
Closes #12158.

Conflicts:
	guides/source/action_controller_overview.md
Remove single trailing ')' bracket
Merge pull request #13057 from bricejlin/patch-1

Remove single trailing ')' bracket [ci skip]
Fix bug when validating the uniqueness of an aliased attribute.
Merge pull request #13061 from laurocaetano/fix-uniqueness-validation-for-aliased-attribute

Fix bug when validating the uniqueness of an aliased attribute.
Merge pull request #13018 from heruku/scoping_fix

changed update counter to act on unscoped model
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/has_many_associations_test.rb
Merge pull request #13070 from kuldeepaggarwal/documentation-updation

[ci skip] used new syntax for scopes
Merge pull request #13071 from kuldeepaggarwal/documentation-updation

[ci skip]removed obsolete information about `options` parameter in create method