summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-09 11:07:55 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-09 11:07:55 +0000
commit20cd146e93cd4589117fbd388bdbc95daf3cc903 (patch)
tree60093b045d54bf03a29dabc8024fc1f33802b1e5
parent8a97dfdeab9658c616601b361fc6eb66efce2510 (diff)
downloadredmine-20cd146e93cd4589117fbd388bdbc95daf3cc903.tar.gz
redmine-20cd146e93cd4589117fbd388bdbc95daf3cc903.zip
Backported r11494 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11577 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 8a30e19a0..5ecc41fc1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,9 +45,11 @@ if File.exist?(database_file)
if adapters.any?
adapters.each do |adapter|
case adapter
- when /mysql/
- gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18]
- gem "mysql2", "~> 0.3.11", :platforms => [:mri_19, :mingw_19]
+ when 'mysql2'
+ gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
+ gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+ when 'mysql'
+ gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/
gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]