Merge branch 'master' into treewip

* master: (27 commits)
  move digest cache on to the DetailsKey object
  remove object `hash` cache
  [ci skip] fix suggested change-replace 'an' with 'the in Rails engine guide'
  Missing documentation about hash algorithm option for MessageVerifier [ci skip]
  set `skip_listen` option to dummy appplication
  Fix the language in engines guide
  Add accidentally removed `#` [ci skip]
  fields_for_style needs to test for AC::Parameters
  Fix indentation for code block in changelog
  Remove accidentally duplicated change log title [ci skip]
  partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2
  Remove needless `case_insensitive_comparison` in mysql2 adapter
  modify to `error` also abort when specify fail fast option
  Implement ActionController::Parameters#inspect
  remove unused method
  Remove unused Journey code
  Add Action Cable CHANGELOG in release notes [ci skip]
  Show proper error message when a non-relation object is passed to AR::Relation#or
  Fix semantics of test names for finish option in batches_test
  Fix typo
  ...

Conflicts:
	actionview/lib/action_view/digestor.rb

1 files changed, 1 insertions, 0 deletions

diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index ab63f5825c..bce86875e1 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -177,6 +177,7 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal [:color], first_model.stored_attributes[:data]
     assert_equal [:color, :width, :height], second_model.stored_attributes[:data]
     assert_equal [:color, :area, :volume], third_model.stored_attributes[:data]
+    assert_equal [:color], first_model.stored_attributes[:data]
   end
 
   test "YAML coder initializes the store when a Nil value is given" do