See also commit 5ac2341f

Improve usage example for model generator decimal field

Fix migration docs to use new remove_column  semantics

Fixes: #12640

ActiveRecord Store works with PG `hstore` columns

This is necessary because as of 5ac2341f `hstore` columns are always stored
as `Hash` with `String` keys. `ActiveRecord::Store` expected the attribute to
be an instance of `HashWithIndifferentAccess`, which led to the bug.

Currently they are all stored globally in the same `Hash`.
This commit forces the creation of a per-class variable if necessary.

The behavior was exposed through the following test-case:

```
  1) Failure:
StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]:
--- expected
+++ actual
@@ -1 +1 @@
-[:color, :homepage, :favorite_food]
+[:resolution, :color, :homepage, :favorite_food]
```

Save association when primary key is manually set

Conflicts:
	activerecord/CHANGELOG.md

Avoid unnecessary catching of Exception instead of StandardError (conver...

Avoid unnecessary catching of Exception instead of StandardError (converting Exceptions into StandardErrors)

* Remove unneeded comments.
* Use key? instead of keys.include?.

Issue #8442

Always check to see if methods exist after calling define_attribute_methods

Allow any version of BCrypt

Add params option for button_to

Conflicts:
	actionpack/CHANGELOG.md

Make slice! honor default hash value/proc

update CHANGELOG

Fix typo: `has_many :pets`, not `pets :has_many`.

pass app config to controller helper proxy

After this fix application config become available when calling helper outisde of view

config/application.rb

    #...
    config.asset_host = 'http://mycdn.com'
    #...

Somewhere else

    ActionController::Base.helpers.asset_path('fallback.png')
    # => http://mycdn.com/assets/fallback.png

Correct error in Utils.normalize_path that changed paths improperly

[ci skip] second parameter of asset-url is deprecated

Let validates_inclusion_of accept Time and DateTime ranges

fixes 4.0.0 regression introduced in 0317b93c

Conflicts:
	Gemfile