From 577961d122edb3352c7a62e9175fa1bfdaeecc3b Mon Sep 17 00:00:00 2001
From: Logan Fick <logaldeveloper@protonmail.com>
Date: Wed, 25 Oct 2017 22:59:01 -0400
Subject: Made use of jomo's patch to mail-gpg.

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8c8cb60..c66df69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'highlight_js-rails', github: 'RedstonerServer/highlight_js-rails'
 gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination
 gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-rails' # @mentions
 gem 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32'
-gem 'mail-gpg'
+gem 'mail-gpg', github: 'jomo/mail-gpg', ref: 'a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 870c3f6..f88e22b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,6 +31,15 @@ GIT
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
 
+GIT
+  remote: git://github.com/jomo/mail-gpg.git
+  revision: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
+  ref: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
+  specs:
+    mail-gpg (0.3.1)
+      gpgme (~> 2.0, >= 2.0.2)
+      mail (~> 2.5, >= 2.5.3)
+
 GIT
   remote: git://github.com/rails/rails.git
   revision: 2c8f567e53580872d8c6dfe61201e58793ca131e
@@ -151,9 +160,6 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mail-gpg (0.3.1)
-      gpgme (~> 2.0, >= 2.0.2)
-      mail (~> 2.5, >= 2.5.3)
     mime-types (2.99)
     mini_portile (0.6.2)
     mini_portile2 (2.0.0)
@@ -250,7 +256,7 @@ DEPENDENCIES
   jquery-rails
   jquery-textcomplete-rails!
   kaminari!
-  mail-gpg
+  mail-gpg!
   mysql2
   rails!
   rails-erd
-- 
cgit v1.2.3