Merge branch 'master' of github.com:rails/rails

* 'master' of github.com:rails/rails:
  Fix release instructions
  Raise an error when AS::JSON.decode is called with options
  Moved all JSON core extensions into core_ext/object/json

1 files changed, 9 insertions, 0 deletions

diff --git a/activesupport/test/core_ext/object/json_test.rb b/activesupport/test/core_ext/object/json_test.rb
new file mode 100644
index 0000000000..d3d31530df
--- /dev/null
+++ b/activesupport/test/core_ext/object/json_test.rb
@@ -0,0 +1,9 @@
+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