aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-06-18 10:11:47 +0200
committerXavier Noria <fxn@hashref.com>2011-06-18 10:11:47 +0200
commit146ec2d1df81b19ed5f36b9572ad70a5814fa49d (patch)
treeef2d9d54b0ba6f2c7f5bc46c982dcbedad38ca54 /actionpack/lib/action_controller
parent08983fefd547142ef8b913af1859b96597753d9f (diff)
parent0fd52bb6c79f20b8dbd5c8afb774ef1dae155fc4 (diff)
downloadrails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.tar.gz
rails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.tar.bz2
rails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/redirecting.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index 55c650df6c..dee7eb1ec8 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -43,6 +43,7 @@ module ActionController
#
# The status code can either be a standard {HTTP Status code}[http://www.iana.org/assignments/http-status-codes] as an
# integer, or a symbol representing the downcased, underscored and symbolized description.
+ # Note that the status code must be a 3xx HTTP code, or redirection will not occur.
#
# It is also possible to assign a flash message as part of the redirection. There are two special accessors for commonly used the flash names
# +alert+ and +notice+ as well as a general purpose +flash+ bucket.