diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 11:37:58 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 11:37:58 +0000 |
| commit | 7fbcdfb074a0ca92e3d35f6b3c4d78f1940f88ef (patch) | |
| tree | 0e7246b3e10849a3086233028cf9b6fad0cd0211 | |
| parent | 970f20e192ebfe682a12ccf93ef206863fc0f450 (diff) | |
| parent | a922cb883522e2c213b29d784834bb167c06567a (diff) | |
| download | gitlab-ce-7fbcdfb074a0ca92e3d35f6b3c4d78f1940f88ef.tar.gz | |
Merge branch 'backport-ee-mysql2-version' into 'master'
Update the mysql2 gem to v0.4.5
See merge request !12859
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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) |