1 files changed, 21 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 1ba52444c1..21c79949ca 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,23 @@
+*   Match `HashWithIndifferentAccess#default`'s behaviour with `Hash#default`.
+
+    *David Cornu*
+
+*   Adds `:exception_object` key to `ActiveSupport::Notifications::Instrumenter`
+    payload when an exception is raised.
+
+    Adds new key/value pair to payload when an exception is raised:
+    e.g. `:exception_object => #<RuntimeError: FAIL>`.
+
+    *Ryan T. Hosford*
+
+*   Support extended grapheme clusters and UAX 29.
+
+    *Adam Roben*
+
+*   Add petabyte and exabyte numeric conversion.
+
+    *Akshay Vishnoi*
+
 ## Rails 5.0.0.beta1 (December 18, 2015) ##
 
 *   Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread.
@@ -14,7 +34,7 @@
       def self.reset() self.account = self.user = nil end
     end
 
-    class ApplicationController < ActiveController::Base
+    class ApplicationController < ActionController::Base
       before_action :set_current
       after_action { Current.reset }