Merge remote-tracking branch 'parent/main' into upstream-20241113

2024-11-13 08:17:38 +09:00 · 2024-11-13 08:17:38 +09:00 · 910eafda63
commit 910eafda63
parent a41f51501c 2bd56f726a
177 changed files with 1625 additions and 659 deletions
--- a/app/helpers/registration_helper.rb
+++ b/app/helpers/registration_helper.rb
@ -18,6 +18,6 @@ module RegistrationHelper
  end

  def ip_blocked?(remote_ip)
-    IpBlock.where(severity: :sign_up_block).exists?(['ip >>= ?', remote_ip.to_s])
+    IpBlock.severity_sign_up_block.containing(remote_ip.to_s).exists?
  end
 end