Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 22:29:05 +01:00 · 2022-01-16 22:29:05 +01:00 · 21828806b3
parent 923eda5cd5 928890bd38
commit 21828806b3
1 changed files with 1 additions and 1 deletions
--- a/app/helpers/admin/dashboard_helper.rb
+++ b/app/helpers/admin/dashboard_helper.rb
@ -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)