Merge branch 'master' into openid

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

diff --git a/app/models/user.rb b/app/models/user.rb
index f02c9a5cd0067b63afc3984575534c38fb0a550b..09e1a7d35611a9c3178a4832a3b19845b5faf0fe 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -22,6 +22,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