deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

resolved issue 244 and updated test

Browse source
This commit is contained in:
Drew 2011-11-18 01:32:22 -05:00
parent 26bdeb2107
commit 15016ae68d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -30,7 +30,7 @@ class User < ActiveRecord::Base
scope :not_in_project, lambda { |project| where("id not in (:ids)", :ids => project.users.map(&:id) ) } scope :not_in_project, lambda { |project| where("id not in (:ids)", :ids => project.users.map(&:id) ) }
def identifier def identifier
email.gsub "@", "_" email.gsub /[@.]/, "_"
end end
def is_admin? def is_admin?

2
spec/models/user_spec.rb
View file

@ -16,7 +16,7 @@ describe User do
it "should return valid identifier" do it "should return valid identifier" do
user = User.new(:email => "test@mail.com") user = User.new(:email => "test@mail.com")
user.identifier.should == "test_mail.com" user.identifier.should == "test_mail_com"
end end
it "should have authentication token" do it "should have authentication token" do