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

2021-01-21 16:51:12 +01:00
parent 73d5b05019 7d0031a515
commit f90fa11db5
12 changed files with 84 additions and 84 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -152,7 +152,7 @@ class User < ApplicationRecord

  def confirm
    new_user      = !confirmed?
-    self.approved = true if open_registrations?
+    self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?

    super