diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-22 10:19:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-22 10:19:25 -0400 |
commit | a6a93f9ed5af5c84cf35dc03759c0b7d9d880cd2 (patch) | |
tree | e619535bbb36b8c9bb7467bc492b1599fd632e9a /actionview | |
parent | 0541a0d5481043a9c78371446389794944daf3f0 (diff) | |
parent | 87d6cb379d8cffd3f12b2dab6248ff3e8f830307 (diff) | |
download | rails-a6a93f9ed5af5c84cf35dc03759c0b7d9d880cd2.tar.gz rails-a6a93f9ed5af5c84cf35dc03759c0b7d9d880cd2.tar.bz2 rails-a6a93f9ed5af5c84cf35dc03759c0b7d9d880cd2.zip |
Merge pull request #28829 from y-yagi/follow_up_128b804
Set to `form_with_generates_remote_forms` only when config is explicitly specified
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/railtie.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index bc474f453e..61678933e9 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -19,8 +19,10 @@ module ActionView initializer "action_view.form_with_generates_remote_forms" do |app| ActiveSupport.on_load(:action_view) do - ActionView::Helpers::FormHelper.form_with_generates_remote_forms = - app.config.action_view.delete(:form_with_generates_remote_forms) + form_with_generates_remote_forms = app.config.action_view.delete(:form_with_generates_remote_forms) + unless form_with_generates_remote_forms.nil? + ActionView::Helpers::FormHelper.form_with_generates_remote_forms = form_with_generates_remote_forms + end end end |