diff options
author | Alexis Reigel <mail@koffeinfrei.org> | 2017-06-12 16:16:33 +0200 |
---|---|---|
committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:42:53 +0200 |
commit | 7e13d96715750f74db399bf40ee4ec9679bbe806 (patch) | |
tree | b26af883e7055a7d8990bdc2e168117b260bbc7f /app/models/user.rb | |
parent | d1101ec02ec718d0ce15e76217980f6fa21c9089 (diff) | |
download | gitlab-ce-7e13d96715750f74db399bf40ee4ec9679bbe806.tar.gz |
don't sync to keychain file
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 42c83e3d206..5aebd36cf8a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -155,7 +155,6 @@ 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 :synchronize_gpg_keys, 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 @@ -1158,10 +1157,4 @@ class User < ActiveRecord::Base ensure Gitlab::ExclusiveLease.cancel(lease_key, uuid) end - - def synchronize_gpg_keys - gpg_keys.each do |gpg_key| - gpg_key.synchronize_keychain - end - end end |