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

2020-01-25 10:04:41 +01:00
parent 0be67df4f0 f816da9c64
commit 61f699c0e9
12 changed files with 91 additions and 30 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -129,9 +129,7 @@ class User < ApplicationRecord
  end

  def disable!
-    update!(disabled: true,
-            last_sign_in_at: current_sign_in_at,
-            current_sign_in_at: nil)
+    update!(disabled: true)
  end

  def enable!
@@ -302,7 +300,7 @@ class User < ApplicationRecord
      arr << [current_sign_in_at, current_sign_in_ip] if current_sign_in_ip.present?
      arr << [last_sign_in_at, last_sign_in_ip] if last_sign_in_ip.present?

-      arr.sort_by(&:first).uniq(&:last).reverse!
+      arr.sort_by { |pair| pair.first || Time.now.utc }.uniq(&:last).reverse!
    end
  end