Merge f344c4d0ff into 549ab089ee

app/helpers/registration_helper.rb

@@ -16,6 +16,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.exists?(['ip >>= ?', remote_ip.to_s])
   end
 end

app/models/ip_block.rb

@@ -36,7 +36,7 @@ class IpBlock < ApplicationRecord
 
   class << self
     def blocked?(remote_ip)
-      blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(IpBlock.where(severity: :no_access).pluck(:ip)) }
+      blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(severity_no_access.pluck(:ip)) }
       blocked_ips_map.include?(remote_ip)
     end
   end