summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-26 12:20:45 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-26 12:20:45 +0000
commit9a8f430db61616d669952cdf01c155b51a460c4d (patch)
tree3876695709e4e775cac88534cefefeb6e2a9d169 /Gemfile
parent23941adee12287cbb9c5c7e207547a93d9272ed8 (diff)
downloadredmine-9a8f430db61616d669952cdf01c155b51a460c4d.tar.gz
redmine-9a8f430db61616d669952cdf01c155b51a460c4d.zip
Ruby2.0: switch mysql2 platforms by RUBY_VERSION
It seems old bundler does not support :mri_20 and :mingw_20 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11490 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index d6bc22a78..5da32e43c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,8 @@ if File.exist?(database_file)
case adapter
when /mysql/
gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18]
- gem "mysql2", "~> 0.3.11", :platforms => [:mri_19, :mingw_19, :mri_20, :mingw_20]
+ mysql2_platforms = RUBY_VERSION >= '2.0' ? [:mri_20, :mingw_20] : [:mri_19, :mingw_19]
+ gem "mysql2", "~> 0.3.11", :platforms => mysql2_platforms
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/
gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]