X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/565171486f6d90321e0291d5ccc3cf6a1c12e730..26a9f98dc1746e5964276034de893c0a86a13758:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 9d135a3a1..ae5b0b74f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,6 +11,9 @@ class User < ActiveRecord::Base has_many :preferences, :class_name => "UserPreference" has_many :changesets + has_many :client_applications + has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application] + validates_presence_of :email, :display_name validates_confirmation_of :email#, :message => ' addresses must match' validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'