Merge branch 'master' into openid

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

diff --git a/app/models/user.rb b/app/models/user.rb
index d2535bbd48f2c41e585abe4135176f8434e19765..79af5d71f66c1836e69213aa812c7af32b66fcb2 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,6 +23,7 @@ class User < ActiveRecord::Base
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
+  validates_uniqueness_of :openid_url, :allow_nil => true
   validates_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
   validates_email_format_of :email