From 8a4d68c53e9c58ad7f8dce1494f7976292b2f929 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 21 Feb 2017 19:02:23 -0600 Subject: Enable Style/ConditionalAssignment --- lib/gitlab/saml/user.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/gitlab/saml/user.rb') diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb index f253dc7477e..abde05d9b68 100644 --- a/lib/gitlab/saml/user.rb +++ b/lib/gitlab/saml/user.rb @@ -28,10 +28,10 @@ module Gitlab 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? - @user.external = false + @user.external = if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty? + false else - @user.external = true + true end end -- cgit v1.2.3 From 5c7f9d69e3db27921acf6d8259245f2b4babcc2b Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 22 Feb 2017 09:10:32 -0600 Subject: Fix code for cops --- lib/gitlab/saml/user.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/gitlab/saml/user.rb') diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb index abde05d9b68..8a7cc690046 100644 --- a/lib/gitlab/saml/user.rb +++ b/lib/gitlab/saml/user.rb @@ -28,11 +28,12 @@ module Gitlab 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. - @user.external = if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty? - false - else - true - end + @user.external = + if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty? + false + else + true + end end @user -- cgit v1.2.3