diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-10 18:07:33 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-10 18:07:33 -0300 |
| commit | 0e2fbd80e2420329738b891240d44a056cea1de4 (patch) | |
| tree | 5b16755670be58e168b5e86e2cdcb43ee5aa3918 /activeresource/CHANGELOG | |
| parent | eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413 (diff) | |
| parent | 600a89f2082beadf4af9fe140a1a2ae56386cd49 (diff) | |
| download | rails-0e2fbd80e2420329738b891240d44a056cea1de4.tar.gz rails-0e2fbd80e2420329738b891240d44a056cea1de4.tar.bz2 rails-0e2fbd80e2420329738b891240d44a056cea1de4.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'activeresource/CHANGELOG')
| -rw-r--r-- | activeresource/CHANGELOG | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 6572934893..113694e895 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,3 +1,14 @@ +*Edge* + +* Add support for errors in JSON format. #1956 [Fabien Jakimowicz] + +* Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh] + +* More thorough SSL support. #2370 [Roy Nicholson] + +* HTTP proxy support. #2133 [Marshall Huss, Sébastien Dabet] + + *2.3.2 [Final] (March 15, 2009)* * Nothing new, just included in 2.3.2 |