aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-12-16 15:31:34 -0500
committerSean Griffin <sean@seantheprogrammer.com>2015-12-16 13:33:22 -0700
commitbc39fa07ae20e119b9122625a10ed0e92e8839d0 (patch)
treedfed61b8e467612474b2721c8f68f471434ccded /Gemfile
parentcbbb89f1c9edcf438625b10178c8b2faf6ef4114 (diff)
downloadrails-bc39fa07ae20e119b9122625a10ed0e92e8839d0.tar.gz
rails-bc39fa07ae20e119b9122625a10ed0e92e8839d0.tar.bz2
rails-bc39fa07ae20e119b9122625a10ed0e92e8839d0.zip
Fix test failures on Windows
Unlike unix, the TZ variable on Windows does not look at a database. It is always expected to be in the form {Standard Time Abbreviation}{UTC-Offset}{Daylight Time Abbriviation}. This changes the relevant tests to use the Windows form when run from Windows.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ff75cdd090..879a77d767 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
group :db do
gem 'pg', '>= 0.18.0'
- gem 'mysql', '>= 2.9.0'
+ # gem 'mysql', '>= 2.9.0'
gem 'mysql2', '>= 0.4.0'
end
end