github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 05:30:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Review Changes for f4f8a293e7.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-02-20 14:44:51 +08:00
parent f4f8a293e7
commit 14f3594f9f
47 changed files with 843 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/user.rb
View File

@ -18,6 +18,7 @@ class User < ActiveRecord::Base
include Searchable
include Roleable
include HasCustomFields
include SecondFactorManager
# TODO: Remove this after 7th Jan 2018
self.ignored_columns = %w{email}
@ -462,10 +463,6 @@ class User < ActiveRecord::Base
'' # so that validator doesn't complain that a password attribute doesn't exist
end
def second_factor
'' # so that validator doesn't complain that a password attribute doesn't exist
end
# Indicate that this is NOT a passwordless account for the purposes of validation
def password_required!
@password_required = true