aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/force_ssl.rb
diff options
context:
space:
mode:
authorHrvoje Šimić <shime@twobucks.co>2017-03-11 14:17:44 +0100
committerHrvoje Šimić <shime@twobucks.co>2017-03-12 15:59:40 +0100
commitb383b346600d5325a211376837bc83b7ae472f46 (patch)
treece3ca544d577f7f23f80975c215a13ff7c9fd3fd /actionpack/lib/action_controller/metal/force_ssl.rb
parent2e752d18b37498cfaa204567342edfc79783edcb (diff)
downloadrails-b383b346600d5325a211376837bc83b7ae472f46.tar.gz
rails-b383b346600d5325a211376837bc83b7ae472f46.tar.bz2
rails-b383b346600d5325a211376837bc83b7ae472f46.zip
[docs] fix ActionController documentation
[ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal/force_ssl.rb')
-rw-r--r--actionpack/lib/action_controller/metal/force_ssl.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index 9d43e752ac..876e0feff5 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -10,9 +10,9 @@ module ActionController
#
# Note that if you are really concerned about your application security,
# you might consider using +config.force_ssl+ in your config file instead.
- # That will ensure all the data transferred via HTTPS protocol and prevent
- # the user from getting their session hijacked when accessing the site over
- # unsecured HTTP protocol.
+ # That will ensure all the data is transferred via HTTPS protocol and will
+ # prevent the user from getting their session hijacked when accessing the
+ # site over unsecured HTTP protocol.
module ForceSSL
extend ActiveSupport::Concern
include AbstractController::Callbacks
@@ -71,7 +71,7 @@ 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 &
+ # * <tt>host_or_options</tt> - Either a host name or any of the url and
# redirect options available to the <tt>force_ssl</tt> method.
def force_ssl_redirect(host_or_options = nil)
unless request.ssl?