summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaparov <abulhair.saparov@gmail.com>2017-12-19 19:10:14 -0500
committerasaparov <abulhair.saparov@gmail.com>2017-12-21 21:28:11 -0500
commit965617a05e4715a8687a16bc21ba9b75055d8dac (patch)
tree05c258d6fcc8be057f43855da481f040f27c2c87
parent36f4710301926bb853b35d9b14a60e03b42def34 (diff)
downloadgitlab-ce-965617a05e4715a8687a16bc21ba9b75055d8dac.tar.gz
Bumped mysql2 gem version from 0.4.5 to 0.4.10.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--changelogs/unreleased/bump_mysql_gem.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index b6ffaf80f24..cc39714295e 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.4.5', group: :mysql
+gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a6e3c9e27cc..d11cadeec30 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -501,7 +501,7 @@ GEM
mustermann (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
- mysql2 (0.4.5)
+ mysql2 (0.4.10)
net-ldap (0.16.0)
net-ssh (4.1.0)
netrc (0.11.0)
@@ -1082,7 +1082,7 @@ DEPENDENCIES
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
- mysql2 (~> 0.4.5)
+ mysql2 (~> 0.4.10)
net-ldap
net-ssh (~> 4.1.0)
nokogiri (~> 1.8.1)
diff --git a/changelogs/unreleased/bump_mysql_gem.yml b/changelogs/unreleased/bump_mysql_gem.yml
new file mode 100644
index 00000000000..58166949d72
--- /dev/null
+++ b/changelogs/unreleased/bump_mysql_gem.yml
@@ -0,0 +1,5 @@
+---
+title: Bump mysql2 gem version from 0.4.5 to 0.4.10
+merge_request:
+author: asaparov
+type: other