From 6410d2122069a7eced244daacc7fbd033a3c34f9 Mon Sep 17 00:00:00 2001
From: Anderson Dias <andersondaraujo@gmail.com>
Date: Wed, 28 Mar 2012 15:35:32 -0300
Subject: Fix quotes at select_tag examples

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 41d895c15e..44d8b48531 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -95,7 +95,7 @@ module ActionView
       #   # => <select id="colors" multiple="multiple" name="colors[]"><option>Red</option>
       #   #    <option>Green</option><option>Blue</option></select>
       #
-      #   select_tag "locations", "<option>Home</option><option selected="selected">Work</option><option>Out</option>".html_safe
+      #   select_tag "locations", "<option>Home</option><option selected='selected'>Work</option><option>Out</option>".html_safe
       #   # => <select id="locations" name="locations"><option>Home</option><option selected='selected'>Work</option>
       #   #    <option>Out</option></select>
       #
-- 
cgit v1.2.3


From e81084330059e57b0a2422e351dbb28633f69434 Mon Sep 17 00:00:00 2001
From: Tony Primerano <tony.primerano@gxs.com>
Date: Wed, 28 Mar 2012 16:35:06 -0400
Subject: CSRF messages are no longer controlled by 422.html because
 InvalidAuthenticityToken is not raised

---
 actionpack/lib/action_controller/metal/request_forgery_protection.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 3081c14c09..0bff1825d9 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -17,7 +17,6 @@ module ActionController #:nodoc:
   # CSRF protection is turned on with the <tt>protect_from_forgery</tt> method,
   # which checks the token and resets the session if it doesn't match what was expected.
   # A call to this method is generated for new \Rails applications by default.
-  # You can customize the error message by editing public/422.html.
   #
   # The token parameter is named <tt>authenticity_token</tt> by default. The name and
   # value of this token must be added to every layout that renders forms by including
-- 
cgit v1.2.3


From 6e814ce62f8225c5f23f7a73d2896699ea99af48 Mon Sep 17 00:00:00 2001
From: Erich Menge <erich.menge@me.com>
Date: Sun, 1 Apr 2012 08:39:57 -0500
Subject: :success includes the whole 200 range, not just 200.

  # File lib/rack/response.rb, line 114
114:       def successful?;    @status >= 200 && @status < 300;       end
---
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index a5e7a8c715..bea54f9778 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -8,7 +8,7 @@ module ActionDispatch
 
       # Asserts that the response is one of the following types:
       #
-      # * <tt>:success</tt>   - Status code was 200
+      # * <tt>:success</tt>   - Status code was in the 200-299 range
       # * <tt>:redirect</tt>  - Status code was in the 300-399 range
       # * <tt>:missing</tt>   - Status code was 404
       # * <tt>:error</tt>     - Status code was in the 500-599 range
-- 
cgit v1.2.3