1 files changed, 40 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index cae4ee7fde..ee05ea3255 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,42 @@
+*   Fix Active Support `Time#to_json` and `DateTime#to_json` to return 3 decimal
+    places worth of fractional seconds, similar to `TimeWithZone`.
+
+    *Ryan Glover*
+
+*   Removed circular reference protection in JSON encoder, deprecated
+    `ActiveSupport::JSON::Encoding::CircularReferenceError`.
+
+    *Godfrey Chan*, *Sergio Campamá*
+
+*   Add `capitalize` option to `Inflector.humanize`, so strings can be humanized without being capitalized:
+
+        'employee_salary'.humanize                    # => "Employee salary"
+        'employee_salary'.humanize(capitalize: false) # => "employee salary"
+
+    *claudiob*
+
+*   Fixed `Object#as_json` and `Struct#as_json` not working properly with options. They now take
+    the same options as `Hash#as_json`:
+
+        struct = Struct.new(:foo, :bar).new
+        struct.foo = "hello"
+        struct.bar = "world"
+        json = struct.as_json(only: [:foo]) # => {foo: "hello"}
+
+    *Sergio Campamá*, *Godfrey Chan*
+
+*   Added `Numeric#in_milliseconds`, like `1.hour.in_milliseconds`, so we can feed them to JavaScript functions like `getTime()`.
+
+    *DHH*
+
+*   Calling `ActiveSupport::JSON.decode` with unsupported options now raises an error.
+
+    *Godfrey Chan*
+
+*   Support `:unless_exist` in `FileStore`.
+
+    *Michael Grosser*
+
 *   Fix `slice!` deleting the default value of the hash.
 
     *Antonio Santos*
@@ -7,7 +46,7 @@
 
     *Benjamin Fleischer*
 
-*   Disable the ability to iterate over Range of AS::TimeWithZone 
+*   Disable the ability to iterate over Range of AS::TimeWithZone
     due to significant performance issues.
 
     *Bogdan Gusiev*