gitlabhq/gitlabhq — pull request #5063 by karlhungus (2013-09-13 02:44:52+00:00)
Title: Allows username only updates to ldap properties

-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date

-I added back some tests under auth_oauth_spec, including tests for my additions

Conflicts:
spec/lib/auth_spec.rb

Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574