mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-23 22:41:29 +00:00
Merge branch 'main' into glitch-soc/merge-upstream
This commit is contained in:
commit
278bd61d6f
|
@ -2,7 +2,7 @@
|
|||
|
||||
module Admin::DashboardHelper
|
||||
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
|
||||
ip_query_addr = IPAddr.new(ip_query)
|
||||
|
|
Loading…
Reference in a new issue