mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Merge branch 'main' into glitch-soc/merge-upstream
This commit is contained in:
commit
278bd61d6f
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
module Admin::DashboardHelper
|
module Admin::DashboardHelper
|
||||||
def relevant_account_ip(account, ip_query)
|
def relevant_account_ip(account, ip_query)
|
||||||
ips = account.user.ips.to_a
|
ips = account.user.present? ? account.user.ips.to_a : []
|
||||||
|
|
||||||
matched_ip = begin
|
matched_ip = begin
|
||||||
ip_query_addr = IPAddr.new(ip_query)
|
ip_query_addr = IPAddr.new(ip_query)
|
||||||
|
Loading…
Reference in New Issue
Block a user