summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-05-27 07:32:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-05-27 07:32:59 +0000
commitd06d0b1c39a11327facf8d374e25bab2add70741 (patch)
tree2ee8dae18e0e63da0ca981340869bf005300171a /Gemfile
parent0c9cf4d445ebbab8f44950fbcf42ea4faca343ae (diff)
downloadredmine-d06d0b1c39a11327facf8d374e25bab2add70741.tar.gz
redmine-d06d0b1c39a11327facf8d374e25bab2add70741.zip
Merged r16553 (#25829).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 00d44b520..138884823 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ if File.exist?(database_file)
adapters.each do |adapter|
case adapter
when 'mysql2'
- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
+ gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when 'mysql'
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby