github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 23:36:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

disable email white/blacklisting for staged users

Browse Source
This commit is contained in:
Régis Hanol
2016-07-04 16:05:01 +02:00
parent 8053bde1a2
commit 59680af329
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -72,7 +72,7 @@ class User < ActiveRecord::Base
validates_presence_of :username
validate :username_validator, if: :username_changed?
validates :email, presence: true, uniqueness: true
validates :email, email: true, if: :email_changed?
validates :email, email: true, if: Proc.new { |u| !u.staged && u.email_changed? }
validate :password_validator
validates :name, user_full_name: true, if: :name_changed?
validates :ip_address, allowed_ip_address: {on: :create, message: :signup_not_allowed}