aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorSharang Dashputre <sharang.d@gmail.com>2018-10-02 13:39:40 +0530
committerSharang Dashputre <sharang.d@gmail.com>2018-10-02 13:55:39 +0530
commit3c4b729f48c0320499f16a2e6f50a3d27bde1114 (patch)
treea0662fdf46c00056fb2ea6ec804611f2587e0be0 /actionview
parent8171a1b9db029f4c6d45e2df3037d53a4864acb1 (diff)
downloadrails-3c4b729f48c0320499f16a2e6f50a3d27bde1114.tar.gz
rails-3c4b729f48c0320499f16a2e6f50a3d27bde1114.tar.bz2
rails-3c4b729f48c0320499f16a2e6f50a3d27bde1114.zip
Fix spellings for 'unmarshall(ing/ed)' & 'marshall(ing/ed)'
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/template.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
index 69a64948cc..d7aee18a84 100644
--- a/actionview/lib/action_view/template.rb
+++ b/actionview/lib/action_view/template.rb
@@ -236,9 +236,9 @@ module ActionView
end
- # Exceptions are marshaled when using the parallel test runner with DRb, so we need
- # to ensure that references to the template object can be marshaled as well. This means forgoing
- # the marshalling of the compiler mutex and instantiating that again on unmarshaling.
+ # 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.
def marshal_dump # :nodoc:
[ @source, @identifier, @handler, @compiled, @original_encoding, @locals, @virtual_path, @updated_at, @formats, @variants ]
end