diff options
| author | Steffen Köhler <git@steffenkoehler.net> | 2016-01-07 19:14:41 +0100 |
|---|---|---|
| committer | Steffen Köhler <git@steffenkoehler.net> | 2016-01-15 14:55:52 +0100 |
| commit | 2444c04055c7cc7d48c0301e8cd9d30fc534d460 (patch) | |
| tree | a7cdd3f5b4bc2eeb26009d59ec595844abd078aa | |
| parent | 03604b39eb043ca81eed6f3192abe5eef7cd06be (diff) | |
| download | gitlab-ce-2444c04055c7cc7d48c0301e8cd9d30fc534d460.tar.gz | |
Fix signup for some OAuth providers
some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore
a signup fails because the name is empty. Best guess for the name is
probably the username, therefore use it as name.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/o_auth/user.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d01576be67a..f9442382f20 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.4.0 (unreleased) - Expire view caches when application settings change (e.g. Gravatar disabled) (Stan Hu) - Don't notify users twice if they are both project watchers and subscribers (Stan Hu) - Remove gray background from layout in UI + - Fix signup for OAuth providers that don't provide a name - Implement new UI for group page - Implement search inside emoji picker - Add API support for looking up a user by username (Stan Hu) diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index f1a362f5303..e3d2cc65a8f 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -141,9 +141,12 @@ module Gitlab username = auth_hash.username email = auth_hash.email end + + name = auth_hash.name + name = ::Namespace.clean_path(username) if name.strip.empty? { - name: auth_hash.name, + name: name, username: ::Namespace.clean_path(username), email: email, password: auth_hash.password, |