aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/template.rb
diff options
context:
space:
mode:
authorToshimaru <me@toshimaru.net>2016-12-09 04:55:21 +0900
committerToshimaru <me@toshimaru.net>2016-12-09 05:21:11 +0900
commitd9ff835b99ff3c7567ccde9b1379b4deeabee32f (patch)
tree93b9258440a74ddb9f0978f5b42d8850de28fdfe /actionview/lib/action_view/template.rb
parent7407d35c5417b6ef872663936a5880ede8ab711c (diff)
downloadrails-d9ff835b99ff3c7567ccde9b1379b4deeabee32f.tar.gz
rails-d9ff835b99ff3c7567ccde9b1379b4deeabee32f.tar.bz2
rails-d9ff835b99ff3c7567ccde9b1379b4deeabee32f.zip
split DELEGATION_RESERVED_METHOD_NAMES in half
Diffstat (limited to 'actionview/lib/action_view/template.rb')
-rw-r--r--actionview/lib/action_view/template.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
index d67f37d6d1..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.dup.delete("block")
+ 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