diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-03 09:38:15 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-03 09:38:15 -0700 |
| commit | e30cb83c7a063302c2fc1b4f913ae7d50f594425 (patch) | |
| tree | 2c8bfcca9b64b11747cf5b831b5800b6e086d5e3 /activesupport/test/json | |
| parent | 826ed62ff6bcc7bb5f91480c998cb1c04c139faf (diff) | |
| parent | 6eced6a1fe041db64a06298fb8203fbb5287a8db (diff) | |
| download | rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.tar.gz rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.tar.bz2 rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.zip | |
Merge pull request #18795 from vipulnsward/remove-magic-comments
Removed magic comments (`# encoding: utf-8`) from tests since it's default from ruby 2 onwards
Diffstat (limited to 'activesupport/test/json')
| -rw-r--r-- | activesupport/test/json/decoding_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/json/encoding_test.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index 80bf255080..f2fc456f4b 100644 --- a/activesupport/test/json/decoding_test.rb +++ b/activesupport/test/json/decoding_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' require 'active_support/json' require 'active_support/time' diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index 5c5045da1e..63d921e3b4 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'securerandom' require 'abstract_unit' require 'active_support/core_ext/string/inflections' |