diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-21 18:28:23 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-21 18:28:23 +0100 |
| commit | 38bfaf885543f349e88bb18edbc3536cefc0701c (patch) | |
| tree | 8cd8f0b68c26bb46e14b20484b828df1159363a5 /app/models/user.rb | |
| parent | 61d5744dcc33d4cfdd26a38af138a4a416a93868 (diff) | |
| parent | 43961035a906cd8bccdf4c1ac023980b37823bb3 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 6495ae04c..8cc0a21ff 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -83,7 +83,7 @@ class User < ApplicationRecord has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text } - validates :invite_request, presence: true, on: :create, if: -> { Setting.require_invite_text } + validates :invite_request, presence: true, on: :create, if: -> { Setting.require_invite_text && !invited? } validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? validates_with BlacklistedEmailValidator, on: :create |