diff options
author | Matthew Draper <matthew@trebex.net> | 2016-12-09 09:50:54 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 09:50:54 +1030 |
commit | 81608cda9c0e3a3e70dc189481f68129ed74b8ba (patch) | |
tree | 1e8d0d45d3594bc99a0f2eff17eb32e787c451d1 /actionview/lib | |
parent | 847e9dd5c12b34856f5c74d52bc6c86b1735ffe5 (diff) | |
parent | d9ff835b99ff3c7567ccde9b1379b4deeabee32f (diff) | |
download | rails-81608cda9c0e3a3e70dc189481f68129ed74b8ba.tar.gz rails-81608cda9c0e3a3e70dc189481f68129ed74b8ba.tar.bz2 rails-81608cda9c0e3a3e70dc189481f68129ed74b8ba.zip |
Merge pull request #27303 from toshimaru/fix/partial-variable-block
Enable `block` variable in view
Diffstat (limited to 'actionview/lib')
-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 2dcd6324db..0afdcd1def 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -326,7 +326,7 @@ module ActionView def locals_code #:nodoc: # Only locals with valid variable names get set directly. Others will # still be available in local_assigns. - locals = @locals.to_set - Module::DELEGATION_RESERVED_METHOD_NAMES + locals = @locals - Module::RUBY_RESERVED_KEYWORDS locals = locals.grep(/\A(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/) # Double assign to suppress the dreaded 'assigned but unused variable' warning |