Merge branch 'master' into unlock-minitest

1 files changed, 37 insertions, 1 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 4c3eded38a..facd723bc5 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,8 +1,44 @@
+*   Add `freeze_time` helper which freezes time to `Time.now` in tests.
+
+    *Prathamesh Sonpatki*
+
+*   Default `ActiveSupport::MessageEncryptor` to use AES 256 GCM encryption.
+
+    On for new Rails 5.2 apps. Upgrading apps can find the config as a new
+    framework default.
+
+    *Assain Jaleel*
+
+*   Cache: `write_multi`
+
+        Rails.cache.write_multi foo: 'bar', baz: 'qux'
+
+    Plus faster fetch_multi with stores that implement `write_multi_entries`.
+    Keys that aren't found may be written to the cache store in one shot
+    instead of separate writes.
+
+    The default implementation simply calls `write_entry` for each entry.
+    Stores may override if they're capable of one-shot bulk writes, like
+    Redis `MSET`.
+
+    *Jeremy Daer*
+
+*   Add default option to module and class attribute accessors.
+
+        mattr_accessor :settings, default: {}
+
+    Works for `mattr_reader`, `mattr_writer`, `cattr_accessor`, `cattr_reader`,
+    and `cattr_writer` as well.
+
+    *Genadi Samokovarov*
+
 *   Add `Date#prev_occurring` and `Date#next_occurring` to return specified next/previous occurring day of week.
 
     *Shota Iguchi*
 
-*   Add default option to class_attribute. Before:
+*   Add default option to `class_attribute`.
+
+    Before:
 
         class_attribute :settings
         self.settings = {}