diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-25 23:34:53 +0200 |
|---|---|---|
| committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-25 23:39:34 +0200 |
| commit | 9cafc28874a681082f9f7e1e445db91f195a25ae (patch) | |
| tree | 6504cf5ab233e716173a416012f9e908764c9e9e /activesupport/lib/active_support/json/encoding.rb | |
| parent | 7fd0a6de849606b5449c55e41151d556d14ef75d (diff) | |
| download | rails-9cafc28874a681082f9f7e1e445db91f195a25ae.tar.gz rails-9cafc28874a681082f9f7e1e445db91f195a25ae.tar.bz2 rails-9cafc28874a681082f9f7e1e445db91f195a25ae.zip | |
Removed deprecated methods and related tests from ActiveSupport
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index c2c45e9f9d..67698c1cff 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -1,6 +1,5 @@ require 'active_support/core_ext/object/to_json' require 'active_support/core_ext/module/delegation' -require 'active_support/deprecation' require 'active_support/json/variable' require 'active_support/ordered_hash' @@ -139,8 +138,6 @@ module ActiveSupport self.use_standard_json_time_format = true self.escape_html_entities_in_json = false end - - CircularReferenceError = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::JSON::CircularReferenceError', Encoding::CircularReferenceError) end end |