diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 17:26:35 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 17:26:35 -0300 |
| commit | 8eb7813f49f30c1843ca905fd0a404a516977f73 (patch) | |
| tree | 083679bc67dce5cf2d053888a5cce6271df8d937 | |
| parent | 681fbecebd3912db9fac97900956bfc15d7a9207 (diff) | |
| parent | f76e27555df9cb86cd20158a1198a132a45f3916 (diff) | |
| download | rails-8eb7813f49f30c1843ca905fd0a404a516977f73.tar.gz rails-8eb7813f49f30c1843ca905fd0a404a516977f73.tar.bz2 rails-8eb7813f49f30c1843ca905fd0a404a516977f73.zip | |
Merge pull request #14974 from kuldeepaggarwal/remove-deprecated-files
Remove deprecated file
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/to_json.rb | 5 | ||||
| -rw-r--r-- | activesupport/test/core_ext/object/json_test.rb | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/to_json.rb b/activesupport/lib/active_support/core_ext/object/to_json.rb deleted file mode 100644 index f58364f9c6..0000000000 --- a/activesupport/lib/active_support/core_ext/object/to_json.rb +++ /dev/null @@ -1,5 +0,0 @@ -ActiveSupport::Deprecation.warn 'You have required `active_support/core_ext/object/to_json`. ' \ - 'This file will be removed in Rails 4.2. You should require `active_support/core_ext/object/json` ' \ - 'instead.' - -require 'active_support/core_ext/object/json'
\ No newline at end of file diff --git a/activesupport/test/core_ext/object/json_test.rb b/activesupport/test/core_ext/object/json_test.rb deleted file mode 100644 index d3d31530df..0000000000 --- a/activesupport/test/core_ext/object/json_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'abstract_unit' - -class JsonTest < ActiveSupport::TestCase - # See activesupport/test/json/encoding_test.rb for JSON encoding tests - - def test_deprecated_require_to_json_rb - assert_deprecated { require 'active_support/core_ext/object/to_json' } - end -end |