use after_commit instead of AfterCommitQueue

2 files changed, 5 insertions, 12 deletions

diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index 612d954b1c5..050245bd502 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -1,6 +1,4 @@
 class GpgKey < ActiveRecord::Base
-  include AfterCommitQueue
-
   KEY_PREFIX = '-----BEGIN PGP PUBLIC KEY BLOCK-----'.freeze
 
   belongs_to :user
@@ -31,8 +29,8 @@ class GpgKey < ActiveRecord::Base
     unless: -> { errors.has_key?(:key) }
 
   before_validation :extract_fingerprint, :extract_primary_keyid
-  after_create :update_invalid_gpg_signatures_after_create
-  after_create :notify_user
+  after_commit :update_invalid_gpg_signatures, on: :create
+  after_commit :notify_user, on: :create
 
   def key=(value)
     value.strip! unless value.blank?
@@ -75,10 +73,6 @@ class GpgKey < ActiveRecord::Base
   end
 
   def notify_user
-    run_after_commit { NotificationService.new.new_gpg_key(self) }
-  end
-
-  def update_invalid_gpg_signatures_after_create
-    run_after_commit { update_invalid_gpg_signatures }
+    NotificationService.new.new_gpg_key(self)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 931b760df34..03a76f4fa23 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -13,7 +13,6 @@ class User < ActiveRecord::Base
   include IgnorableColumn
   include FeatureGate
   include CreatedAtFilterable
-  include AfterCommitQueue
 
   DEFAULT_NOTIFICATION_LEVEL = :participating
 
@@ -156,10 +155,10 @@ class User < ActiveRecord::Base
   before_validation :set_public_email, if: :public_email_changed?
 
   after_update :update_emails_with_primary_email, if: :email_changed?
-  after_update :update_invalid_gpg_signatures, if: :email_changed?
   before_save :ensure_authentication_token, :ensure_incoming_email_token
   before_save :ensure_user_rights_and_limits, if: :external_changed?
   after_save :ensure_namespace_correct
+  after_commit :update_invalid_gpg_signatures, on: :update, if: -> { previous_changes.key?('email') }
   after_initialize :set_projects_limit
   after_destroy :post_destroy_hook
 
@@ -516,7 +515,7 @@ class User < ActiveRecord::Base
   end
 
   def update_invalid_gpg_signatures
-    run_after_commit { gpg_keys.each(&:update_invalid_gpg_signatures) }
+    gpg_keys.each(&:update_invalid_gpg_signatures)
   end
 
   # Returns the groups a user has access to