Merge branch 'bump_gpgme' into 'master'

Bump gpgme to 2.0.19 See merge request gitlab-org/gitlab!20041

Merge branch 'bump_gpgme' into 'master'
Bump gpgme to 2.0.19 See merge request gitlab-org/gitlab!20041
25ef5de8 · Lin Jen-Shin · 06638cd6 · b7154dbb · 25ef5de8 · 25ef5de8
Commit 25ef5de8 authored Nov 18, 2019 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ gem 'acme-client', '~> 2.0.2'
 gem 'browser', '~> 2.5'

 # GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0.19'

 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -411,7 +411,7 @@ GEM
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (~> 0.7)
-    gpgme (2.0.18)
+    gpgme (2.0.19)
      mini_portile2 (~> 2.3)
    grape (1.1.0)
      activesupport
@@ -1183,7 +1183,7 @@ DEPENDENCIES
  gon (~> 6.2)
  google-api-client (~> 0.23)
  google-protobuf (~> 3.8.0)
-  gpgme (~> 2.0.18)
+  gpgme (~> 2.0.19)
  grape (~> 1.1.0)
  grape-entity (~> 0.7.1)
  grape-path-helpers (~> 1.1)