diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-09 13:40:31 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-09 13:40:31 +0300 |
| commit | 909a8443c63db423f031b8c7f810c13b3bc20b87 (patch) | |
| tree | 407a473ad47c92a98f8b21891ad57731ce58f2bc /lib/gitlab/o_auth | |
| parent | 9c6ed296640ff06d5ae078024f112e44910af235 (diff) | |
Shuffle config around a bit
Diffstat (limited to 'lib/gitlab/o_auth')
| -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 |