Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

just set the host, no need for another hash allocation / merge!

  • Loading branch information...
commit ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d 1 parent 8cbcd19
@tenderlove tenderlove authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  actionpack/lib/action_controller/metal/force_ssl.rb
View
2  actionpack/lib/action_controller/metal/force_ssl.rb
@@ -85,7 +85,7 @@ def force_ssl_redirect(host_or_options = nil)
if host_or_options.is_a?(Hash)
options.merge!(host_or_options)
elsif host_or_options
- options.merge!(:host => host_or_options)
+ options[:host] = host_or_options
end
secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS))
Please sign in to comment.
Something went wrong with that request. Please try again.