X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b8f6dbd403507edd14f04f3151c285e232607360..671fc09bfc1a48e4e6d5722299a29ee6c06891e8:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 90d3835ac..241c1396f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,9 +11,6 @@ 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'