From 3572980d21fb16ac1b3494a76fffde645daaa8ae Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 Nov 2019 17:06:47 +0100
Subject: [PATCH] Bump tzinfo from 1.2.5 to 2.0.0 (#11152)

Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.5 to 2.0.0.
- [Release notes](https://github.com/tzinfo/tzinfo/releases)
- [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
- [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.5...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c86a237eba..23ebb9bdb06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'nokogiri', '1.10.5'
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library
 install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-  gem 'tzinfo', '~> 1.2'
+  gem 'tzinfo', '~> 2.0'
   gem 'tzinfo-data'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0bd8ccada10..452e3e40b6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,10 +104,9 @@ GEM
     stringex (2.8.5)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.6.0)
@@ -129,7 +128,7 @@ DEPENDENCIES
   sass-globbing (= 1.1.5)
   sinatra (= 2.0.7)
   stringex (= 2.8.5)
-  tzinfo (~> 1.2)
+  tzinfo (~> 2.0)
   tzinfo-data
 
 RUBY VERSION