kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update for readability 

fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
This commit is contained in:
Izaak Alpert 2013-09-22 20:25:10 -04:00
parent 75b2ff8f43
commit 8a8123a3d4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gitlab/ldap/user.rb
View File

@ -44,11 +44,15 @@ module Gitlab
end
def find_user(email)
if user = model.find_by_email(email)
elsif ldap_conf['allow_username_or_email_login']
uname = (email.partition('@').first) unless email.nil?
user = model.find_by_email(email)
# If no user found and allow_username_or_email_login is true
# we look for user by extracting part of his email
if !user && email && ldap_conf['allow_username_or_email_login']
uname = email.partition('@').first
user = model.find_by_username(uname)
end
user
end

2
spec/models/user_spec.rb
View File

@ -233,7 +233,7 @@ describe User do
it "should apply defaults to user" do
Gitlab.config.gitlab.default_projects_limit.should_not == 123
Gitlab.config.gitlab.default_can_create_group.should_not be_true
Gitlab.config.gitlab.default_theme.should_not == Gitlab::Theme::MARS
Gitlab.config.gitlab.default_theme.should_not == Gitlab::Theme::BASIC
user.projects_limit.should == 123
user.can_create_group.should be_true
user.theme_id.should == Gitlab::Theme::BASIC