diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:52:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:56:38 -0300 |
| commit | af65b8c9e75052c8ec282e9676502a3a9506ac89 (patch) | |
| tree | ef69072df640d0c516273532ff0219db142e45d0 /activesupport/lib/active_support | |
| parent | 857697bb8722c154163124f25bcf68e39b42ed70 (diff) | |
| download | rails-af65b8c9e75052c8ec282e9676502a3a9506ac89.tar.gz rails-af65b8c9e75052c8ec282e9676502a3a9506ac89.tar.bz2 rails-af65b8c9e75052c8ec282e9676502a3a9506ac89.zip | |
Revert "Deprecate ActiveSupport::JSON::Variable"
This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/variable.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/json/variable.rb b/activesupport/lib/active_support/json/variable.rb index 17b709decc..5685ed18b7 100644 --- a/activesupport/lib/active_support/json/variable.rb +++ b/activesupport/lib/active_support/json/variable.rb @@ -1,15 +1,7 @@ -require 'active_support/deprecation' - module ActiveSupport module JSON - # Deprecated: A string that returns itself as its JSON-encoded form. + # A string that returns itself as its JSON-encoded form. class Variable < String - def initialize(*args) - ActiveSupport::Deprecation.warn 'ActiveSupport::JSON::Variable is deprecated and will be removed in Rails 4.0. ' \ - 'For your own custom JSON literals, define #as_json and #encode_json yourself.' - super - end - def as_json(options = nil) self end #:nodoc: def encode_json(encoder) self end #:nodoc: end |