ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sign-up restrictions based on IP addresses not being enforced (#15607) 

Fixes #15606

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
rebase/4.0.0rc2
ThibG 2021-01-21 06:18:30 +01:00 committed by GitHub
parent d8d75cd6c2
commit e955ca5463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -152,7 +152,7 @@ class User < ApplicationRecord
def confirm def confirm
new_user = !confirmed? new_user = !confirmed?
self.approved = true if open_registrations? self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
super super