summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/o_auth/user.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 6e099c26d8c..356e96fcbab 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -54,12 +54,10 @@ module Gitlab
@user ||= build_new_user
end
- unless @user.nil?
- if external_provider?
- @user.external = true
- else
- @user.external = false
- end
+ if external_provider? && @user
+ @user.external = true
+ elsif @user
+ @user.external = false
end
@user