Lookup the user before setting the locale. Fixes #2068.

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 90d3835ac8ae87266c14ae31ed595aaba6129b00..241c1396ffeca73a51e25a40a72a779ee41a67f7 100644 (file)
--- 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'