Do not use conditionals at Gemfile

This will make the Gemfile.lock be dirty in some environments

2 files changed, 7 insertions, 12 deletions

diff --git a/Gemfile b/Gemfile
index e18780ab2a..a9a326c0ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,13 +79,7 @@ group :test do
 end
 
 platforms :ruby do
-  if Bundler::WINDOWS
-    # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-    gem 'tzinfo-data'
-    gem 'nokogiri', '>= 1.6.7.rc3'
-  else
-    gem 'nokogiri', '>= 1.4.5'
-  end
+  gem 'nokogiri', '>= 1.6.7.rc3'
 
   # Needed for compiling the ActionDispatch::Journey parser
   gem 'racc', '>=1.4.6', require: false
@@ -133,3 +127,4 @@ end
 
 # A gem necessary for ActiveRecord tests with IBM DB
 gem 'ibm_db' if ENV['IBM_DB']
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index c3b348d035..da4614db2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GIT
 
 GIT
   remote: git://github.com/rails/sprockets.git
-  revision: 9675919a2733c2888a236756395f08b2294631bb
+  revision: edae5cdfa241b0fb0fcb756b25cd561c3d8b7f29
   branch: master
   specs:
     sprockets (4.0.0)
@@ -151,7 +151,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     amq-protocol (2.0.0)
-    backburner (1.0.0)
+    backburner (1.1.0)
       beaneater (~> 1.0)
       dante (> 0.1.5)
     bcrypt (3.1.10)
@@ -183,8 +183,8 @@ GEM
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
     execjs (2.6.0)
-    hitimes (1.2.2)
-    hitimes (1.2.2-x86-mingw32)
+    hitimes (1.2.3)
+    hitimes (1.2.3-x86-mingw32)
     i18n (0.7.0)
     json (1.8.3)
     kindlerb (0.1.1)
@@ -194,7 +194,7 @@ GEM
       nokogiri (>= 1.5.9)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.7.0.rc4)
     minitest (5.3.3)
     mocha (0.14.0)