aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'activeresource/CHANGELOG')
-rw-r--r--activeresource/CHANGELOG9
1 files changed, 9 insertions, 0 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index ef3f3f6a17..c81f7daacb 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,5 +1,14 @@
*SVN*
+* Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. [Jeremy Kemper]
+
+ # Example controller action
+ def update
+ @person.save!
+ rescue ActiveRecord::StaleObjectError
+ render :xml => @person.reload.to_xml, :status => '409 Conflict'
+ end
+
* Basic validation support [Rick Olson]
Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.