aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorEric Guo <eric.guo@sandisk.com>2015-09-12 22:04:31 +0800
committerEric Guo <eric.guo@sandisk.com>2015-09-12 23:46:37 +0800
commitbbfd17689bfe3b94550edecd99584b66de4dfa93 (patch)
tree70e9f5eab1bd1d7d6175b281c157ad305e6fa2fe /Gemfile
parent59ec70dcbeb2fb6d1d5ef63bd807ec0e915f7b3a (diff)
downloadrails-bbfd17689bfe3b94550edecd99584b66de4dfa93.tar.gz
rails-bbfd17689bfe3b94550edecd99584b66de4dfa93.tar.bz2
rails-bbfd17689bfe3b94550edecd99584b66de4dfa93.zip
Ruby 2.2.3 in windows need nokogiri 1.6.7.rc3 as it's the only version having correct pre-compiled so
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index bbff1d9b42..e18780ab2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,13 @@ group :test do
end
platforms :ruby do
- gem 'nokogiri', '>= 1.4.5'
+ 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
# Needed for compiling the ActionDispatch::Journey parser
gem 'racc', '>=1.4.6', require: false