diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:36:21 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:36:21 -0200 |
| commit | 46923cabe156852bac1ae99c4509ff2780eae2a1 (patch) | |
| tree | 494992d285acdbd44742c5c932be6526580f6941 /actionview/lib/action_view/template | |
| parent | d7d11f0dab7f2875d04c17921e12fe62ac6e9566 (diff) | |
| parent | 45f70dca7bbd822604941d0486e4a120882afcde (diff) | |
| download | rails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.gz rails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.bz2 rails-46923cabe156852bac1ae99c4509ff2780eae2a1.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'actionview/lib/action_view/template')
| -rw-r--r-- | actionview/lib/action_view/template/resolver.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/template/types.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb index 3304605c1a..3279f068c9 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -1,6 +1,6 @@ require "pathname" require "active_support/core_ext/class" -require "active_support/core_ext/class/attribute_accessors" +require "active_support/core_ext/module/attribute_accessors" require "action_view/template" require "thread" require "thread_safe" diff --git a/actionview/lib/action_view/template/types.rb b/actionview/lib/action_view/template/types.rb index db77cb5d19..b84e0281ae 100644 --- a/actionview/lib/action_view/template/types.rb +++ b/actionview/lib/action_view/template/types.rb @@ -1,5 +1,5 @@ require 'set' -require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/core_ext/module/attribute_accessors' module ActionView class Template |