aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2018-04-19 09:25:02 +0100
committerGitHub <noreply@github.com>2018-04-19 09:25:02 +0100
commitb6577cb62880a88380fce6a086a1c084d5a74c18 (patch)
tree9ea30543b6b2f68f15d9c0b711054ee035a4b8fe /activesupport/CHANGELOG.md
parentef2af628a9ec1cc4e7b6997a021dd3f85cfe4665 (diff)
parentfb2af6f849c8d25732f2c17352c59f2dc8b8320d (diff)
downloadrails-b6577cb62880a88380fce6a086a1c084d5a74c18.tar.gz
rails-b6577cb62880a88380fce6a086a1c084d5a74c18.tar.bz2
rails-b6577cb62880a88380fce6a086a1c084d5a74c18.zip
Merge pull request #32613 from dsander/fix-as-timezone-all
Fix exception in AS::Timezone.all when any tzinfo data is missing
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 483eb12ce1..247eec68ac 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Fix bug where `ActiveSupport::Timezone.all` would fail when tzinfo data for
+ any timezone defined in `ActiveSupport::MAPPING` is missing.
+
+ *Dominik Sander*
+
* Redis cache store: `delete_matched` no longer blocks the Redis server.
(Switches from evaled Lua to a batched SCAN + DEL loop.)