Mercurial > hg > soundsoftware-site
diff lib/tasks/.svn/text-base/migrate_from_trac.rake.svn-base @ 120:cd2282d2aa55 cannam
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 |
line wrap: on
line diff
--- a/lib/tasks/.svn/text-base/migrate_from_trac.rake.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/lib/tasks/.svn/text-base/migrate_from_trac.rake.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -246,8 +246,8 @@ ln = ($2 || '-').strip u = User.new :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-'), - :firstname => fn[0, limit_for(User, 'firstname')].gsub(/[^\w\s\'\-]/i, '-'), - :lastname => ln[0, limit_for(User, 'lastname')].gsub(/[^\w\s\'\-]/i, '-') + :firstname => fn[0, limit_for(User, 'firstname')], + :lastname => ln[0, limit_for(User, 'lastname')] u.login = username[0,limit_for(User, 'login')].gsub(/[^a-z0-9_\-@\.]/i, '-') u.password = 'trac'