diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-01-06 05:00:54 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-01-06 05:00:54 -0800 |
| commit | f18078475efce9eeef27d64044058539517b0260 (patch) | |
| tree | 9c6245a12f9dd4ed8b3f5e018fc9a0f3b415164c /actionpack | |
| parent | 7843e009d2bc8d088437ff6f43e47ba113de9dee (diff) | |
| parent | 7a439d23de4c7c187b0deda8e02138b3dccf0181 (diff) | |
| download | rails-f18078475efce9eeef27d64044058539517b0260.tar.gz rails-f18078475efce9eeef27d64044058539517b0260.tar.bz2 rails-f18078475efce9eeef27d64044058539517b0260.zip | |
Merge pull request #8777 from goshakkk/delegate-class
Delegate to :class rather than 'self.class'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 73799e8085..91864f2a35 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -209,7 +209,7 @@ module AbstractController _write_layout_method end - delegate :_layout_conditions, :to => "self.class" + delegate :_layout_conditions, to: :class module ClassMethods def inherited(klass) # :nodoc: diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 8b23029bbc..1a1083bf00 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -118,7 +118,7 @@ module ActionView private - delegate :caching?, :to => "self.class" + delegate :caching?, to: :class # This is what child classes implement. No defaults are needed # because Resolver guarantees that the arguments are present and |