summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-05-27 07:33:09 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-05-27 07:33:09 +0000
commit93b08e804453d831b0280eb97fe4fde8becf882d (patch)
treefa145b99717547a1b759d80953128f0a32d4d2f9
parent837bc019df36273295120ca26c89390dc413588b (diff)
downloadredmine-93b08e804453d831b0280eb97fe4fde8becf882d.tar.gz
redmine-93b08e804453d831b0280eb97fe4fde8becf882d.zip
Merged r16553 (#25829).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16561 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 9e6d74ade..293782e0f 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