Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Dmitriy Zaporozhets
2 parents 8b05490f 1a57a1e4
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
lib/gitlab/oauth/user.rb
@@ -34,9 +34,11 @@ module Gitlab
           # In this case we generate temporary email and force user to fill it later
           if user.email.blank?
             user.generate_tmp_oauth_email
-          else
+          elsif provider != "ldap"
             # Google oauth returns email but dont return nickname
             # So we use part of email as username for new user
+            # For LDAP, username is already set to the user's
+            # uid/userid/sAMAccountName.
             user.username = email.match(/^[^@]*/)[0]
           end
...	...	@@ -34,9 +34,11 @@ module Gitlab
34	34	# In this case we generate temporary email and force user to fill it later
35	35	if user.email.blank?
36	36	user.generate_tmp_oauth_email
37		- else
	37	+ elsif provider != "ldap"
38	38	# Google oauth returns email but dont return nickname
39	39	# So we use part of email as username for new user
	40	+ # For LDAP, username is already set to the user's
	41	+ # uid/userid/sAMAccountName.
40	42	user.username = email.match(/^[^@]*/)[0]
41	43	end
42	44
...	...