diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-12 03:03:35 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-29 00:04:45 -0700 |
| commit | bf7fbe64f70aa15de00dce30ed90f3669540bab7 (patch) | |
| tree | 2b1948bb9b8845728f5a0cc803a3bb503660a472 /ci | |
| parent | 5de072c73082d901cc319a810fe6159065c26257 (diff) | |
| download | rails-bf7fbe64f70aa15de00dce30ed90f3669540bab7.tar.gz rails-bf7fbe64f70aa15de00dce30ed90f3669540bab7.tar.bz2 rails-bf7fbe64f70aa15de00dce30ed90f3669540bab7.zip | |
Fixed a compatibility issue with the `Oj` gem
`Time#as_json`, `Date#as_json` and `DateTime#as_json` incorrectly depends on a
delegation that is set up in `active_support/json/encoding`. We cannot simply
require that file in `core_ext/object/json` because it would cause a circular
dependency problem (see #12203 for background). We should instead rely on AS's
autoload to load that file for us on-demand.
To trigger autoload correctly, we need to reference the `AS::JSON::Encoding`
constant instead of using the delegated version.
Fixes #16131.
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions