Merge branch…

Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address_on_user_creation' into 'master' Use ldap uid as username instead of first part of email address on user creation

Merge branch…
1a57a1e4 · Dmitriy Zaporozhets · 68b89142 · 566badba · 1a57a1e4
Commit 1a57a1e4 authored May 13, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

user.rb lib/gitlab/oauth/user.rb +3 -1

No files found.
--- 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