diff options
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 91ca16913e..338d5980ab 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -183,7 +183,6 @@ module ActionController #:nodoc: private def inherited_with_layout(child) inherited_without_layout(child) - child.send :include, Reloadable layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '') child.layout(layout_match) unless layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty? end |