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

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index 7f1d1cd6532..d154bd8600b 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/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