From 8a8123a3d4d3a5f991ae599e454b99fd548d47f2 Mon Sep 17 00:00:00 2001 From: Izaak Alpert Date: Sun, 22 Sep 2013 20:25:10 -0400 Subject: [PATCH] Update for readability fixed a test a broke in the configurable theme PR Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e --- lib/gitlab/ldap/user.rb | 10 +++++++--- spec/models/user_spec.rb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 1606210aafc..260bacfeeb0 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -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 diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 2b42226ecaf..c879900f8fd 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -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