Better control flow and added guard clause.

lib/gitlab/saml/user.rb

@@ -26,8 +26,7 @@ module Gitlab
           @user ||= build_new_user
         end
 
-        unless @user.nil?
-          if external_users_enabled?
+        if external_users_enabled? && @user
           # Check if there is overlap between the user's groups and the external groups
           # setting then set user as external or internal.
           if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
@@ -36,7 +35,6 @@ module Gitlab
             @user.external = true
           end
         end
-        end
 
         @user
       end
@@ -50,11 +48,8 @@ module Gitlab
       end
 
       def changed?
-        if gl_user
+        return true unless gl_user
         gl_user.changed? || gl_user.identities.any?(&:changed?)
-        else
-          true
-        end
       end
 
       protected