Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

2023-05-25 22:59:30 +02:00
parent ad1098970b 4a22e72b9b
commit 2e02d03524
48 changed files with 1232 additions and 160 deletions
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -132,7 +132,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  end

  def set_sessions
-    @sessions = current_user.session_activations
+    @sessions = current_user.session_activations.order(updated_at: :desc)
  end

  def set_strikes