Permalink
Browse files

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

  • Loading branch information...
1 parent 8cbcd19 commit ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d @tenderlove tenderlove committed Aug 1, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 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))

0 comments on commit ea7fc2e

Please sign in to comment.