about summary refs log tree commit diff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-02-26 17:27:17 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-02-26 17:27:17 +0100
commit67c6f37e269a4ebb538e019351f894183f3c1439 (patch)
tree6868722efeb660c0031a22aecfdc4b2c5bc9dcc6 /app/controllers/admin
parent756f1b6615ac858c958468d1306c39a06db551bb (diff)
parent6aef76b5cde2315135d53215d13a9b2ec0a1adaa (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/email_domain_blocks_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index 33ee079f3..a4bbbba5b 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -38,6 +38,8 @@ module Admin
           log_action :create, @email_domain_block
 
           (@email_domain_block.other_domains || []).uniq.each do |domain|
+            next if EmailDomainBlock.where(domain: domain).exists?
+
             other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
             log_action :create, other_email_domain_block
           end