1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 1ba52444c1..3117fa49a0 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 5.0.0.beta1 (December 18, 2015) ##
 
+*   Add petabyte and exabyte numeric conversion.
+
+    *Akshay Vishnoi*
+
 *   Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread.
     This makes it easy to declare per-thread globals that are encapsulated. Note: This is a sharp edge. A wild proliferation
     of globals is A Bad Thing. But like other sharp tools, when it's right, it's right.
@@ -14,7 +18,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 }