diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
| commit | f90fa11db5935521f662ce0d9c608a1037e40da8 (patch) | |
| tree | 9a5bb397170bb5880934f5695854865935c6e9c9 /app/models | |
| parent | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (diff) | |
| parent | 7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9316eb228..023dc3609 100644 --- 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 |