summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorC. Morgan Hamill <chamill@wesleyan.edu>2014-05-08 09:23:17 -0400
committerC. Morgan Hamill <chamill@wesleyan.edu>2014-05-08 09:23:17 -0400
commit04561011177f5323f4fe0e18e7a0137d72b314ea (patch)
tree2dee275ff539e39b11436ffdfffbf68b4941b6d3 /lib
parenta45f7262f9a3e26361b6fde4f77d0d27437535cf (diff)
downloadgitlab-ce-04561011177f5323f4fe0e18e7a0137d72b314ea.tar.gz
Clean up conditional statement in `name` method.
Reverse the conditional order to avoid awkward `if !` construction.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index e9e57aa5742..7f1d1cd6532 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -65,10 +65,10 @@ module Gitlab
end
def name
- if !auth.info.name.nil?
- auth.info.name.to_s.force_encoding('utf-8')
- else
+ if auth.info.name.nil?
"#{auth.info.first_name} #{auth.info.last_name}".force_encoding('utf-8')
+ else
+ auth.info.name.to_s.force_encoding('utf-8')
end
end