From 5e3e5de48b2659afd09361ed34e592e54988e478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 14 Sep 2015 20:12:09 -0300 Subject: Do not use conditionals at Gemfile This will make the Gemfile.lock be dirty in some environments --- Gemfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Gemfile') 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] -- cgit v1.2.3