summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-13 14:26:42 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:42:53 +0200
commit2f956fae0399f6f2eb370ed186c7bb4a9486178b (patch)
tree17586eca89b12af582e25a7b645deff0d25c8572 /lib
parent3c42d730986222d891c9b7985edf3942021afcef (diff)
downloadgitlab-ce-2f956fae0399f6f2eb370ed186c7bb4a9486178b.tar.gz
verify gpg commit using tmp keyring and db query
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gpg.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/gpg.rb b/lib/gitlab/gpg.rb
index 486e040adb6..258901bb238 100644
--- a/lib/gitlab/gpg.rb
+++ b/lib/gitlab/gpg.rb
@@ -2,6 +2,14 @@ module Gitlab
module Gpg
extend self
+ module CurrentKeyChain
+ extend self
+
+ def add(key)
+ GPGME::Key.import(key)
+ end
+ end
+
def fingerprints_from_key(key)
using_tmp_keychain do
import = GPGME::Key.import(key)