diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
| commit | adadd865a2688f31146c877fbeea1269a15d41f4 (patch) | |
| tree | 280c1871410363b6bd16b5efe6af12373b615180 /railties/lib/rails | |
| parent | 6ce54d4ba8c220a84e55e7dd798d364c3f48d9f7 (diff) | |
| parent | da5a47e7b9cd438c68276ad0886f9bb1260867b0 (diff) | |
| download | rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.gz rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.bz2 rails-adadd865a2688f31146c877fbeea1269a15d41f4.zip | |
Merge pull request #5488 from rafaelfranca/ad-ssl
Remove Rack::SSL in favour of ActionDispatch::SSL
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 8d64aff430..d7b8350963 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -225,8 +225,7 @@ module Rails end if config.force_ssl - require "rack/ssl" - middleware.use ::Rack::SSL, config.ssl_options + middleware.use ::ActionDispatch::SSL, config.ssl_options end if config.action_dispatch.x_sendfile_header.present? |