diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-21 17:51:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 17:51:43 +0100 |
| commit | d1255ab8a5101bc04af4a5214f975edf443a37d9 (patch) | |
| tree | b1fdf7512106985fa90cb7a7ffda134440e399af /app/models | |
| parent | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (diff) | |
| parent | c48e2a48ba9a5e873be0deb506aaef4d5bc2426b (diff) | |
Merge pull request #1487 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |