diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-19 16:15:29 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-19 16:15:29 +0200 |
commit | ff54b96d3f8e78d797b378ebceb03546ac234b44 (patch) | |
tree | f7932688954119278e5a80201e6424f4d151b2b7 | |
parent | fac744f87e7076ab3ff2b0b0af16a3e7b2691565 (diff) | |
parent | 2dcd0016e8211055e70af4d88e6b1d5300521b1b (diff) | |
download | rails-ff54b96d3f8e78d797b378ebceb03546ac234b44.tar.gz rails-ff54b96d3f8e78d797b378ebceb03546ac234b44.tar.bz2 rails-ff54b96d3f8e78d797b378ebceb03546ac234b44.zip |
Merge pull request #20931 from eliotsykes/force_ssl-docs-options-formatting
Fix formatting of force_ssl options documentation [ci skip]
-rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index d920668184..e31d65aac2 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -55,10 +55,10 @@ module ActionController # You can pass any of the following options to affect the before_action callback # * <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>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 - # will be called only when it returns a false value. + # * <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 will be called only when it returns a false value. def force_ssl(options = {}) action_options = options.slice(*ACTION_OPTIONS) redirect_options = options.except(*ACTION_OPTIONS) @@ -71,8 +71,8 @@ module ActionController # Redirect the existing request to use the HTTPS protocol. # # ==== Parameters - # * <tt>host_or_options</tt> - Either a host name or any of the url & redirect options - # available to the <tt>force_ssl</tt> method. + # * <tt>host_or_options</tt> - Either a host name or any of the url & + # redirect options available to the <tt>force_ssl</tt> method. def force_ssl_redirect(host_or_options = nil) unless request.ssl? options = { |