From e4a345c1dc13f7de99b782f4a1115d58b7bf1b45 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Fri, 14 Nov 2008 16:07:26 +0100
Subject: Missing changelog for CSRF changes

---
 actionpack/CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 0b3811c794..5b9114755c 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,13 @@
 *2.2.1 [RC2] (November 14th, 2008)*
 
+* Switched the CSRF module to use the request content type to decide if the request is forgeable.  #1145 [Jeff Cohen]
+
 * Added :only and :except to map.resources to let people cut down on the number of redundant routes in an application. Typically only useful for huge routesets.  #1215 [Tom Stuart]
 
+   map.resources :products, :only => :show do |product|
+     product.resources :images, :except => :destroy
+   end
+
 * Added render :js for people who want to render inline JavaScript replies without using RJS [DHH]
 
 * Fixed that polymorphic_url should compact given array #1317 [hiroshi]
-- 
cgit v1.2.3