From af65b8c9e75052c8ec282e9676502a3a9506ac89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 1 Aug 2012 15:52:18 -0300 Subject: Revert "Deprecate ActiveSupport::JSON::Variable" This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57. --- activesupport/lib/active_support/json/variable.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'activesupport/lib/active_support') 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 -- cgit v1.2.3