Merge branch 'bypass-whitelist-for-external-user' into 'master'

Bypass signup domain validation for external users

Closes #25279

See merge request !8575

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index f64d0c17a45..33666b4f35b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -119,7 +119,7 @@ class User < ActiveRecord::Base
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
   before_validation :generate_password, on: :create
-  before_validation :signup_domain_valid?, on: :create
+  before_validation :signup_domain_valid?, on: :create, if: ->(user) { !user.created_by_id }
   before_validation :sanitize_attrs
   before_validation :set_notification_email, if: ->(user) { user.email_changed? }
   before_validation :set_public_email, if: ->(user) { user.public_email_changed? }