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 /activemodel | |
| 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 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 2864c2ba11..7f99536dbb 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/hash/conversions' require 'active_support/core_ext/hash/slice' |