summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-07-14 04:17:03 +0100
committerNick Thomas <nick@gitlab.com>2017-07-14 04:17:03 +0100
commita922cb883522e2c213b29d784834bb167c06567a (patch)
tree227f60325df2218ad0da6dfe012ad6ce347c1e46
parentc306e403fe3f74048488caac64b6c352e7ef5f3d (diff)
downloadgitlab-ce-a922cb883522e2c213b29d784834bb167c06567a.tar.gz
Update the mysql2 gem to v0.4.5
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 0eeb5807d04..8d71ac74308 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
# Supported DBs
-gem 'mysql2', '~> 0.3.16', group: :mysql
+gem 'mysql2', '~> 0.4.5', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.25.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index c27c06e9c34..41ef1e9d456 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,7 +470,7 @@ GEM
tool (~> 0.2)
mustermann-grape (0.4.0)
mustermann (= 0.4.0)
- mysql2 (0.3.20)
+ mysql2 (0.4.5)
net-ldap (0.12.1)
netrc (0.11.0)
nokogiri (1.6.8.1)
@@ -1011,7 +1011,7 @@ DEPENDENCIES
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
- mysql2 (~> 0.3.16)
+ mysql2 (~> 0.4.5)
nokogiri (~> 1.6.7, >= 1.6.7.2)
oauth2 (~> 1.4)
octokit (~> 4.6.2)