Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Claire 2021-01-21 16:51:12 +01:00
commit f90fa11db5
12 changed files with 84 additions and 84 deletions
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
new_user = !confirmed?
self.approved = true if open_registrations?
self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
super