diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-10-30 10:43:43 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-10-30 10:43:43 -0700 |
| commit | dae66a0c9733a7fd2ba4357e24b03b386be3e38f (patch) | |
| tree | cc37c85d095046fd639a6ff682209d007d3f38b6 /activesupport/lib/active_support/core_ext/object.rb | |
| parent | 45318e4010e4f6303ef740bf159d2803c28acc7a (diff) | |
| parent | 64c88fb5d2caf3c34742a07394ac68b8377c4936 (diff) | |
| download | rails-dae66a0c9733a7fd2ba4357e24b03b386be3e38f.tar.gz rails-dae66a0c9733a7fd2ba4357e24b03b386be3e38f.tar.bz2 rails-dae66a0c9733a7fd2ba4357e24b03b386be3e38f.zip | |
Merge pull request #12203 from chancancode/eager_load_json
Eagerload active_support/json/encoding in active_support/core_ext/object/to_json
Diffstat (limited to 'activesupport/lib/active_support/core_ext/object.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index ec2157221f..f4f9152d6a 100644 --- a/activesupport/lib/active_support/core_ext/object.rb +++ b/activesupport/lib/active_support/core_ext/object.rb @@ -8,7 +8,7 @@ require 'active_support/core_ext/object/inclusion' require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/object/instance_variables' -require 'active_support/core_ext/object/to_json' +require 'active_support/core_ext/object/json' require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/object/with_options' |