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

2020-08-13 22:17:29 +02:00
parent 660188c900 0f38f9726a
commit da62e350e0
14 changed files with 72 additions and 30 deletions
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -27,7 +27,7 @@ module Admin
          ips       = []

          Resolv::DNS.open do |dns|
-            dns.timeouts = 1
+            dns.timeouts = 5

            hostnames = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }