diff options
| author | Brett Walker <brett@digitalmoksha.com> | 2017-09-20 13:24:10 +0200 |
|---|---|---|
| committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:26:04 +0200 |
| commit | 665c7876faadc41e1c7a77bb423b951cbcb020ce (patch) | |
| tree | 6250727aee6c97f50e4f254da3c1bc0717206fee /app/models/email.rb | |
| parent | ed99c899a28134e8d9a1a8a8c4677a6ee65bbd2b (diff) | |
| download | gitlab-ce-665c7876faadc41e1c7a77bb423b951cbcb020ce.tar.gz | |
added email.confirmed scope and fix email comparison
Diffstat (limited to 'app/models/email.rb')
| -rw-r--r-- | app/models/email.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/email.rb b/app/models/email.rb index 085663a4fef..041fbbfbe44 100644 --- a/app/models/email.rb +++ b/app/models/email.rb @@ -7,6 +7,8 @@ class Email < ActiveRecord::Base validates :email, presence: true, uniqueness: true, email: true validate :unique_email, if: ->(email) { email.email_changed? } + scope :confirmed, -> { where.not(confirmed_at: nil) } + after_commit :update_invalid_gpg_signatures, if: -> { previous_changes.key?('confirmed_at') } devise :confirmable @@ -19,7 +21,7 @@ class Email < ActiveRecord::Base def unique_email self.errors.add(:email, 'has already been taken') if User.exists?(email: self.email) end - + # once email is confirmed, update the gpg signatures def update_invalid_gpg_signatures user.update_invalid_gpg_signatures if confirmed? |