aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-09-03 11:55:59 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2013-09-03 11:55:59 -0700
commit863c488bb05de3b38a81fa37349977adc0db59e3 (patch)
treeebd9faa9d616b84490ec3c157457448647628ea8 /actionpack
parentc52a4ae565671e3a3b1513a285dc887102d5eb15 (diff)
parent2b6b5404af0cf6c40feba4a94c266c8cd37f6ddc (diff)
downloadrails-863c488bb05de3b38a81fa37349977adc0db59e3.tar.gz
rails-863c488bb05de3b38a81fa37349977adc0db59e3.tar.bz2
rails-863c488bb05de3b38a81fa37349977adc0db59e3.zip
Merge pull request #12126 from namusyaka/fix-some-typos
Fix a few typos.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/force_ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index b8afce42c9..a2cb6d1e66 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -48,7 +48,7 @@ module ActionController
# You can pass any of the following options to affect the redirect status and response
# * <tt>status</tt> - Redirect with a custom status (default is 301 Moved Permanently)
# * <tt>flash</tt> - Set a flash message when redirecting
- # * <tt>alert</tt> - Set a alert message when redirecting
+ # * <tt>alert</tt> - Set an alert message when redirecting
# * <tt>notice</tt> - Set a notice message when redirecting
#
# ==== Action Options