Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-11-19 21:49:09 +01:00
parent a4fd9b704a 366856f3bc
commit 7a56972381
45 changed files with 374 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/ip_block.rb
View File

@@ -31,9 +31,10 @@ class IpBlock < ApplicationRecord
after_commit :reset_cache
def to_log_human_identifier
def to_cidr
"#{ip}/#{ip.prefix}"
end
alias to_log_human_identifier to_cidr
class << self
def blocked?(remote_ip)