From 04561011177f5323f4fe0e18e7a0137d72b314ea Mon Sep 17 00:00:00 2001 From: "C. Morgan Hamill" Date: Thu, 8 May 2014 09:23:17 -0400 Subject: Clean up conditional statement in `name` method. Reverse the conditional order to avoid awkward `if !` construction. --- lib/gitlab/oauth/user.rb | 6 +++--- 1 file 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 -- cgit v1.2.1