Merge branch 'develop' into standalone_develop

This commit is contained in:
2021-12-28 16:10:16 +08:00
24 changed files with 393 additions and 52 deletions

View File

@@ -786,7 +786,7 @@ class User < Owner
end
def profile_is_completed?
self.nickname.present? && self.gender.present? && self.mail.present? && self.custom_department.present?
self.nickname.present? && self.mail.present?
end
protected