diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-05-05 15:32:07 -0500 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-05-05 15:32:07 -0500 |
| commit | dd7bdd0e90ebbf26821ea02d25cc424d6eb370b2 (patch) | |
| tree | f55deb10ac2c0431b53b6168408ba568d25646c9 /activerecord | |
| parent | ea3b88b1eff1d242da5e03ca3ae82f737c0cedbe (diff) | |
| parent | 8afea8ebe715ee5c94e64d4f45a742dfe4d514fa (diff) | |
| download | rails-dd7bdd0e90ebbf26821ea02d25cc424d6eb370b2.tar.gz rails-dd7bdd0e90ebbf26821ea02d25cc424d6eb370b2.tar.bz2 rails-dd7bdd0e90ebbf26821ea02d25cc424d6eb370b2.zip | |
Merge pull request #24868 from vipulnsward/delegate_encode_with
delegate encode_with instead of to_yaml, which is deprecated
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index b397d1fd07..2484cb3264 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -35,7 +35,7 @@ module ActiveRecord # may vary depending on the klass of a relation, so we create a subclass of Relation # for each different klass, and the delegations are compiled into that subclass only. - delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join, + delegate :to_xml, :encode_with, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join, :[], :&, :|, :+, :-, :sample, :reverse, :compact, :in_groups, :in_groups_of, :shuffle, :split, to: :records |