Bring back changelog entries for Active Support

Removed in 0228a73b1094a3e19ad291d2ce4789890c09578a, pull request #7310.

2 files changed, 20 insertions, 2 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 6229b89a91..8bbf887876 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,23 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and
+    #encode_json methods for custom JSON string literals.
+
+    *Erich Menge*
+
+*   Add String#indent. *fxn & Ace Suares*
+
+*   Inflections can now be defined per locale. `singularize` and `pluralize`
+    accept locale as an extra argument.
+
+    *David Celis*
+
+*   `Object#try` will now return nil instead of raise a NoMethodError if the
+    receiving object does not implement the method, but you can still get the
+    old behavior by using the new `Object#try!`.
+
+    *DHH*
+
 *   `ERB::Util.html_escape` now escapes single quotes. *Santiago Pastorino*
 
 *   `Time#change` now works with time values with offsets other than UTC or the local time zone. *Andrew White*
diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index 9974b61078..1079ddde98 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -37,7 +37,7 @@ class Object
       public_send(*a, &b) if respond_to?(a.first)
     end
   end
-  
+
   # Same as #try, but will raise a NoMethodError exception if the receiving is not nil and
   # does not implemented the tried method.
   def try!(*a, &b)
@@ -63,7 +63,7 @@ class NilClass
   def try(*args)
     nil
   end
-  
+
   def try!(*args)
     nil
   end