diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-08 18:18:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-08 18:18:05 -0400 |
commit | 1e3c1ed2352ffe237783e542ad27d7c576148975 (patch) | |
tree | 8030637eb02840c47b647147e4009023b43dad47 /railties/lib | |
parent | 220049fb32152aa3e1124f77c3d7ee8d0347a9ed (diff) | |
parent | 9c326e1fdf54ff099f9f7f94a99bf25c4cf28ffb (diff) | |
download | rails-1e3c1ed2352ffe237783e542ad27d7c576148975.tar.gz rails-1e3c1ed2352ffe237783e542ad27d7c576148975.tar.bz2 rails-1e3c1ed2352ffe237783e542ad27d7c576148975.zip |
Merge pull request #30115 from intrip/30049-application-controller-renderer-defaults-automatic-reload-in-dev
Fix ApplicationController.renderer.defaults overriding in development
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb index 51639b67a0..89d2efab2b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb @@ -1,6 +1,8 @@ # Be sure to restart your server when you modify this file. -# ApplicationController.renderer.defaults.merge!( -# http_host: 'example.org', -# https: false -# ) +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end |