summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/account.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 2c5455d8e57..8be36bf5b82 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -570,7 +570,11 @@ class Account < ApplicationRecord
def create_canonical_email_block!
return unless local? && user_email.present?
- CanonicalEmailBlock.create(reference_account: self, email: user_email)
+ begin
+ CanonicalEmailBlock.create(reference_account: self, email: user_email)
+ rescue ActiveRecord::RecordNotUnique
+ # A canonical e-mail block may already exist for the same e-mail
+ end
end
def destroy_canonical_email_block!