Merge branch 'main' into glitch-soc/main

2022-12-09 16:48:55 +01:00
parent 859db01268 4555ecf995
commit e877bb47b8
102 changed files with 1909 additions and 3311 deletions
--- 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