X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ad2739347b5fc7c57d8b7131580fda10cc77f108..48f68bbc97337ee84d995a1ce1aa0a51296a4cbb:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 958a03a98..125e5e973 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -98,7 +98,8 @@ class User < ApplicationRecord :normalized_uniqueness => { :case_sensitive => false } validates :display_name, :if => proc { |u| u.display_name_changed? }, :characters => { :url_safe => true }, - :whitespace => { :leading => false, :trailing => false } + :whitespace => { :leading => false, :trailing => false }, + :width => { :minimum => 3 } validate :display_name_cannot_be_user_id_with_other_id, :if => proc { |u| u.display_name_changed? } validates :email, :presence => true, :confirmation => true, :characters => true validates :email, :if => proc { |u| u.email_changed? }, @@ -124,6 +125,10 @@ class User < ApplicationRecord before_save :update_tile after_save :spam_check + generates_token_for :new_user, :expires_in => 1.week do + fingerprint + end + generates_token_for :new_email, :expires_in => 1.week do fingerprint end