aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-14 20:12:09 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-14 20:12:09 -0300
commit5e3e5de48b2659afd09361ed34e592e54988e478 (patch)
treea234512ccc892d942a92c923f168ae365d580dc6 /Gemfile
parent2db7304c2c338711b265e92a51d29121cbd702e6 (diff)
downloadrails-5e3e5de48b2659afd09361ed34e592e54988e478.tar.gz
rails-5e3e5de48b2659afd09361ed34e592e54988e478.tar.bz2
rails-5e3e5de48b2659afd09361ed34e592e54988e478.zip
Do not use conditionals at Gemfile
This will make the Gemfile.lock be dirty in some environments
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile9
1 files changed, 2 insertions, 7 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]