diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-28 22:26:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-28 22:26:05 +0000 |
| commit | 0ea79ccfbae27b5734c75f02944aff4cd5a1fb43 (patch) | |
| tree | 3e293e26867e9311f16ab06dd62ba178992970d9 | |
| parent | 84f53f648f5fe5c75d978caaad767c4f4be09fae (diff) | |
| parent | 63cff44fa3272d4e327bb47cf7b2d953fd3cfba1 (diff) | |
| download | gitlab-ce-0ea79ccfbae27b5734c75f02944aff4cd5a1fb43.tar.gz | |
Merge branch 'bump_mysql_gem' into 'master'
Bumped mysql2 gem version from 0.4.5 to 0.4.10.
See merge request gitlab-org/gitlab-ce!16034
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/bump_mysql_gem.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -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 83c8637c28d..90db5bc42fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -505,7 +505,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) @@ -1087,7 +1087,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 |