diff options
author | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:07 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:10 -0300 |
commit | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (patch) | |
tree | 39f6e9036ab11b5059f34e72e65dfeca84bcbbff /activeresource/CHANGELOG | |
parent | 3c8e1f99b9613cca4813e2a1b062d58ec4b2627b (diff) | |
parent | b422cda2ebfff4032f4c18271e96ad329c413dcc (diff) | |
download | rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.gz rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.bz2 rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.zip |
Merge josevalim/deprecations branch.
I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
Diffstat (limited to 'activeresource/CHANGELOG')
-rw-r--r-- | activeresource/CHANGELOG | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 7fc621f005..37da2a711c 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,30 +1,12 @@ -*Rails 3.0.0 (unreleased)* +*Rails 3.1.0 (unreleased)* * No changes -*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)* - -* No changes - - -*Rails 3.0.0 [release candidate] (July 26th, 2010)* - -* No changes - - -*Rails 3.0.0 [beta 4] (June 8th, 2010)* +*Rails 3.0.0 (August 29, 2010)* * JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option. [Santiago Pastorino] - -*Rails 3.0.0 [beta 3] (April 13th, 2010)* - -* No changes - - -*Rails 3.0.0 [beta 1] (February 4, 2010)* - * Add support for errors in JSON format. #1956 [Fabien Jakimowicz] * Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh] |