diff options
| author | Abulhair Saparov <abulhair.saparov@gmail.com> | 2018-12-03 05:59:52 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-03 05:59:52 +0000 |
| commit | 60c595c9e1c72ff81b3a5f44afaa2e9ed0880de5 (patch) | |
| tree | b1e6b380056139799ed08f373bbafcbeec35a0c4 | |
| parent | a445aa0a9267f191fab1c46d438b42fbec549da5 (diff) | |
| download | gitlab-ce-60c595c9e1c72ff81b3a5f44afaa2e9ed0880de5.tar.gz | |
Bump gpgme gem version from 2.0.13 to 2.0.18
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/bump_gpgme_gem.yml | 5 |
4 files changed, 12 insertions, 7 deletions
@@ -82,7 +82,7 @@ gem 'validates_hostname', '~> 1.0.6' gem 'browser', '~> 2.5' # GPG -gem 'gpgme' +gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 27730fa2cc3..e7873932dad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -313,8 +313,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - gpgme (2.0.13) - mini_portile2 (~> 2.1) + gpgme (2.0.18) + mini_portile2 (~> 2.3) grape (1.1.0) activesupport builder @@ -1016,7 +1016,7 @@ DEPENDENCIES gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) - gpgme + gpgme (~> 2.0.18) grape (~> 1.1.0) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 2cd0ef3d97a..7478e2173bd 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -310,8 +310,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - gpgme (2.0.13) - mini_portile2 (~> 2.1) + gpgme (2.0.18) + mini_portile2 (~> 2.3) grape (1.1.0) activesupport builder @@ -1007,7 +1007,7 @@ DEPENDENCIES gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) - gpgme + gpgme (~> 2.0.18) grape (~> 1.1.0) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) diff --git a/changelogs/unreleased/bump_gpgme_gem.yml b/changelogs/unreleased/bump_gpgme_gem.yml new file mode 100644 index 00000000000..4c0067cb824 --- /dev/null +++ b/changelogs/unreleased/bump_gpgme_gem.yml @@ -0,0 +1,5 @@ +--- +title: Bump gpgme gem version from 2.0.13 to 2.0.18 +merge_request: +author: asaparov +type: other |