aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-02-15 15:40:06 -0500
committerGitHub <noreply@github.com>2018-02-15 15:40:06 -0500
commit590d89f793bf7a3d8a133cfc3eaa8fee9cbae87c (patch)
tree50a8a9320f20a39e09ba10f1bb68748262ac815d
parent9f65d2a08bc80a94bbb2c0b6e00957c7059aed25 (diff)
parentea06d2d5b4326b7096631aa0bd90433f3aca2635 (diff)
downloadrails-590d89f793bf7a3d8a133cfc3eaa8fee9cbae87c.tar.gz
rails-590d89f793bf7a3d8a133cfc3eaa8fee9cbae87c.tar.bz2
rails-590d89f793bf7a3d8a133cfc3eaa8fee9cbae87c.zip
Merge pull request #32012 from utilum/mysql_min_version
Bump mysql2 version
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 4fc4ea1009..4ec537d1ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
group :db do
gem "pg", ">= 0.18.0"
- gem "mysql2", ">= 0.4.4"
+ gem "mysql2", ">= 0.4.10"
end
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 97ec56f9c5..5c4e853296 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,9 +322,9 @@ GEM
multipart-post (2.0.0)
mustache (1.0.5)
mustermann (1.0.0)
- mysql2 (0.4.9)
- mysql2 (0.4.9-x64-mingw32)
- mysql2 (0.4.9-x86-mingw32)
+ mysql2 (0.4.10)
+ mysql2 (0.4.10-x64-mingw32)
+ mysql2 (0.4.10-x86-mingw32)
nio4r (2.2.0)
nio4r (2.2.0-java)
nokogiri (1.8.1)
@@ -531,7 +531,7 @@ DEPENDENCIES
mini_magick
minitest-bisect
mocha
- mysql2 (>= 0.4.4)
+ mysql2 (>= 0.4.10)
nokogiri (>= 1.8.1)
pg (>= 0.18.0)
psych (~> 2.0)