Mercurial > hg > soundsoftware-site

diff app/models/.svn/text-base/user.rb.svn-base @ 120:cd2282d2aa55 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 5e974759e8b2
line wrap: on
line diff
--- a/app/models/.svn/text-base/user.rb.svn-base	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/models/.svn/text-base/user.rb.svn-base	Thu Jan 13 14:33:08 2011 +0000
@@ -68,7 +68,6 @@
   # Login must contain lettres, numbers, underscores only
   validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
   validates_length_of :login, :maximum => 30
-  validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i
   validates_length_of :firstname, :lastname, :maximum => 30
   validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
   validates_length_of :mail, :maximum => 60, :allow_nil => true