diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-06-09 23:48:28 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-06-09 23:48:28 -0700 |
| commit | cbfcd9ddf1c964829307a8ce4b483c50252898a7 (patch) | |
| tree | 73c25e049f42333dbaff3a1a95c0153ccacbd11f /activesupport/CHANGELOG.md | |
| parent | f5e133e830940731b74c4e12118eab90054d32ec (diff) | |
| parent | a548792aa0beef4330a3d47eb75dd2fe741013bc (diff) | |
| download | rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.tar.gz rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.tar.bz2 rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.zip | |
Merge pull request #10795 from atambo/master
Don't blindly call blame_file! on exceptions in ActiveSupport::Dependes::Loadable
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 5a1c14683e..0f9399f4d6 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +* Fix `ActiveSupport::Dependencies::Loadable#load_dependency` calling + `#blame_file!` on Exceptions that do not have the Blamable mixin + + *Andrew Kreiling* + * Override `Time.at` to support the passing of Time-like values when called with a single argument. *Andrew White* |