diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-12-09 22:59:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-09 22:59:01 +0100 |
commit | 5d95e6debb496bb4ebba91afc043219c116d3ca2 (patch) | |
tree | 954da9801a3568c5edab20031c7e0bd1d691814d /app/models/user.rb | |
parent | 859db01268bdae0d423ccf97fbeef87eb4f13f0d (diff) | |
parent | 3ea445bb5c856143e758dcb78d89750af91a0f90 (diff) |
Merge pull request #2001 from ClearlyClaire/glitch-soc/main
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
-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 |