Merge branch 'next-minor' into develop

Changelog.md

@@ -32,6 +32,7 @@ Although the chat was never enabled per default and was marked as experimental,
 ## Refactor
 
 ## Bug fixes
+* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
 
 ## Features
 

app/controllers/admins_controller.rb

@@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController
     @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL")
     @created_users.find_each do |u|
       week = u.created_at.beginning_of_week.strftime("%Y-%m-%d")
-      @created_users_by_week[week] << u.username
+      @created_users_by_week[week] << {username: u.username, closed_account: u.person.closed_account}
     end
 
     @selected_week = params[:week] || @created_users_by_week.keys.last

app/views/admins/_weekly_user_stats.haml

@@ -18,4 +18,8 @@
 = t(".amount_of", count: counter)
 %br
 - created_users_by_week[selected_week].each do |m|
-  = link_to m, "/u/#{m}"
+  - if m[:closed_account]
+    %s
+      = m[:username]
+  - else
+    = link_to m[:username], "/u/#{m[:username]}"