Commit f56db5fa authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'djensen-remove-ignored-user-validation-rule' into 'master'

Remove presence validation on User#public_email

See merge request gitlab-org/gitlab!68220
parents b6bdd281 4ac0c36f
......@@ -224,7 +224,7 @@ class User < ApplicationRecord
validates :email, confirmation: true
validates :notification_email, presence: true
validates :notification_email, devise_email: true, if: ->(user) { user.notification_email != user.email }
validates :public_email, presence: true, uniqueness: true, devise_email: true, allow_blank: true
validates :public_email, uniqueness: true, devise_email: true, allow_blank: true
validates :commit_email, devise_email: true, allow_nil: true, if: ->(user) { user.commit_email != user.email }
validates :projects_limit,
presence: true,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment