Merge branch 'master' of github.com:gitlabhq/gitlabhq

This commit is contained in:
Valery Sizov 2012-03-27 23:04:45 +03:00
commit 1bb804da7f
4 changed files with 20 additions and 13 deletions

View file

@ -80,7 +80,7 @@ class User < ActiveRecord::Base
def self.find_for_ldap_auth(omniauth_info)
name = omniauth_info.name
email = omniauth_info.email
email = omniauth_info.email.downcase
if @user = User.find_by_email(email)
@user