From dd09a19ad6f9daf36cd26c749be2b90d4f968b92 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Mon, 23 Apr 2018 16:20:33 +0100 Subject: Auth::User classes refactor adds should_save? --- lib/gitlab/auth/ldap/user.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/gitlab/auth/ldap') diff --git a/lib/gitlab/auth/ldap/user.rb b/lib/gitlab/auth/ldap/user.rb index 6487f32f7b6..922d0567d99 100644 --- a/lib/gitlab/auth/ldap/user.rb +++ b/lib/gitlab/auth/ldap/user.rb @@ -31,15 +31,11 @@ module Gitlab self.class.find_by_uid_and_provider(auth_hash.uid, auth_hash.provider) end - def changed? + override :should_save? + def should_save? gl_user.changed? || gl_user.identities.any?(&:changed?) end - override :omniauth_should_save? - def omniauth_should_save? - changed? && super - end - def block_after_signup? ldap_config.block_auto_created_users end -- cgit v1.2.1