Merge branch 'main' into glitch-soc/merge-upstream

2022-02-26 17:27:17 +01:00
parent 756f1b6615 6aef76b5cd
commit 67c6f37e26
2 changed files with 4 additions and 1 deletions
--- 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