diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-10-03 16:41:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 16:41:16 -0400 |
commit | f0e9a8987329bb848b712044942160a3a3468343 (patch) | |
tree | 4cc313a9b6619c3d5b8a9be925686521b6c3d4b9 | |
parent | 51215d7218dc8ea6fd02e5a8f2d7aab7ff6bfbba (diff) | |
parent | 42469c50610d574d83f329f4a93b3ce4b97fed27 (diff) | |
download | rails-f0e9a8987329bb848b712044942160a3a3468343.tar.gz rails-f0e9a8987329bb848b712044942160a3a3468343.tar.bz2 rails-f0e9a8987329bb848b712044942160a3a3468343.zip |
Merge pull request #34063 from bogdanvlviv/fix-rubocop-offense-b707a6d0eb7
Fix rubocop issue
-rw-r--r-- | actionview/lib/action_view/template.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index d7aee18a84..070d82cf17 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -235,7 +235,7 @@ module ActionView end end - + # Exceptions are marshalled when using the parallel test runner with DRb, so we need # to ensure that references to the template object can be marshalled as well. This means forgoing # the marshalling of the compiler mutex and instantiating that again on unmarshalling. |