diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-08-12 11:32:08 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-08-12 11:32:08 -0700 |
| commit | a84ca223f260bcd5221767ffa158cfe5f1efec2d (patch) | |
| tree | 4aa51303ab7e64f7a88d3a183f27947d4c591595 /actionpack/lib/action_controller | |
| parent | 15184d8b610438d34418342c002b53f441ec647f (diff) | |
| parent | f7f70841b823a945f083735f72fcb18fe929b4db (diff) | |
| download | rails-a84ca223f260bcd5221767ffa158cfe5f1efec2d.tar.gz rails-a84ca223f260bcd5221767ffa158cfe5f1efec2d.tar.bz2 rails-a84ca223f260bcd5221767ffa158cfe5f1efec2d.zip | |
Merge pull request #7339 from maletor/patch-1
Missing closing tag
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 2 |
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 77d799a38a..e905a3cf1d 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -32,7 +32,7 @@ module ActionController # ==== Options # * <tt>host</tt> - Redirect to a different host name # * <tt>only</tt> - The callback should be run only for this action - # * <tt>except<tt> - The callback should be run for all actions except this action + # * <tt>except</tt> - The callback should be run for all actions except this action # * <tt>if</tt> - A symbol naming an instance method or a proc; the callback # will be called only when it returns a true value. # * <tt>unless</tt> - A symbol naming an instance method or a proc; the callback |