diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-05-30 13:04:33 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-05-30 13:04:33 -0700 |
| commit | aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909 (patch) | |
| tree | d812c47c4cf538de1f2d7cc666ccdee7f0191db0 /activesupport/lib/active_support | |
| parent | d5025f15d8ec753ebc03597a0a28f0e05575454e (diff) | |
| parent | 1f5dddcf2fb05f460c13f2ea32c81033ca6b14de (diff) | |
| download | rails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.tar.gz rails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.tar.bz2 rails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.zip | |
Merge pull request #6554 from erichmenge/remove-json-variable
Remove deprecated ActiveSupport::JSON::Variable.
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/variable.rb | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index ded02c873a..6ed253e141 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/json/variable' require 'bigdecimal' require 'active_support/core_ext/big_decimal/conversions' # for #to_s diff --git a/activesupport/lib/active_support/json/variable.rb b/activesupport/lib/active_support/json/variable.rb deleted file mode 100644 index 5685ed18b7..0000000000 --- a/activesupport/lib/active_support/json/variable.rb +++ /dev/null @@ -1,9 +0,0 @@ -module ActiveSupport - module JSON - # A string that returns itself as its JSON-encoded form. - class Variable < String - def as_json(options = nil) self end #:nodoc: - def encode_json(encoder) self end #:nodoc: - end - end -end |