about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-09 16:48:55 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-12-09 16:48:55 +0100
commite877bb47b87a1704e222ea3ceb22f15619bbe775 (patch)
tree745df9b8c395ac4272884664ca40fe06a28aa4a8 /app/models
parent859db01268bdae0d423ccf97fbeef87eb4f13f0d (diff)
parent4555ecf995899c635f1c5d80d4f94fd422a5300c (diff)
Merge branch 'main' into glitch-soc/main
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb2
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