diff options
Diffstat (limited to 'lib/gitlab/o_auth/auth_hash.rb')
| -rw-r--r-- | lib/gitlab/o_auth/auth_hash.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/o_auth/auth_hash.rb b/lib/gitlab/o_auth/auth_hash.rb index 76fbe698c74..d94b104bbf8 100644 --- a/lib/gitlab/o_auth/auth_hash.rb +++ b/lib/gitlab/o_auth/auth_hash.rb @@ -39,8 +39,6 @@ module Gitlab end def get_info(key) - key = :nickname if key == :username - value = info[key] Gitlab::Utils.force_utf8(value) if value value @@ -48,7 +46,7 @@ module Gitlab def username_and_email @username_and_email ||= begin - username = get_info(:username) + username = get_info(:username) || get_info(:nickname) email = get_info(:email) username ||= generate_username(email) if email |