summaryrefslogtreecommitdiff
path: root/app/models/email.rb
diff options
context:
space:
mode:
authorBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
committerBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
commitd97b577a1bee80bd79209d2e6d501d1cd93debcc (patch)
tree660edfe661e2e8c3e14aa3a1986dfecc70eb7d46 /app/models/email.rb
parentd7d335c05b9ae359b72f59c31bbe5ed059df7f52 (diff)
downloadgitlab-ce-d97b577a1bee80bd79209d2e6d501d1cd93debcc.tar.gz
must now set the devise default scope (since we now have an :email scope)
and rubocop fixes
Diffstat (limited to 'app/models/email.rb')
-rw-r--r--app/models/email.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/email.rb b/app/models/email.rb
index 041fbbfbe44..384f38f2db7 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -21,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?