add tzinfo-data since the new tzinfo fails to locate /usr/share/zoneinfo sometimesbaserock/v7.0.0baserock/ps/v7.0.0

2 files changed, 4 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index c64213479f7..e387746d086 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ def linux_only(require_as)
   RUBY_PLATFORM.include?('linux') && require_as
 end
 
+gem 'tzinfo-data', '~> 1.2014.5'
 gem "rails", "~> 4.1.0"
 
 gem "protected_attributes"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c27b6e3739..d6c1bf6f867 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -540,6 +540,8 @@ GEM
       simple_oauth (~> 0.1.4)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2014.5)
+      tzinfo (>= 1.0.0)
     uglifier (2.3.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -678,6 +680,7 @@ DEPENDENCIES
   thin
   tinder (~> 1.9.2)
   turbolinks
+  tzinfo-data (~> 1.2014.5)
   uglifier
   underscore-rails (~> 1.4.4)
   unf