diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-12-09 16:48:55 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-09 16:48:55 +0100 |
commit | e877bb47b87a1704e222ea3ceb22f15619bbe775 (patch) | |
tree | 745df9b8c395ac4272884664ca40fe06a28aa4a8 /app/models | |
parent | 859db01268bdae0d423ccf97fbeef87eb4f13f0d (diff) | |
parent | 4555ecf995899c635f1c5d80d4f94fd422a5300c (diff) |
Merge branch 'main' into glitch-soc/main
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 0eb975dec..209bfa521 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -525,7 +525,7 @@ class User < ApplicationRecord end def invite_text_required? - Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check? + Setting.require_invite_text && !open_registrations? && !invited? && !external? && !bypass_invite_request_check? end def trigger_webhooks |