Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 8 deletions

diff --git a/lib/gitlab/auth/ldap/user.rb b/lib/gitlab/auth/ldap/user.rb
index d134350775d..56c2af1910e 100644
--- a/lib/gitlab/auth/ldap/user.rb
+++ b/lib/gitlab/auth/ldap/user.rb
@@ -11,9 +11,6 @@ module Gitlab
     module Ldap
       class User < Gitlab::Auth::OAuth::User
         extend ::Gitlab::Utils::Override
-        def save
-          super('LDAP')
-        end
 
         # instance methods
         def find_user
@@ -44,6 +41,10 @@ module Gitlab
         def auth_hash=(auth_hash)
           @auth_hash = Gitlab::Auth::Ldap::AuthHash.new(auth_hash)
         end
+
+        def protocol_name
+          'LDAP'
+        end
       end
     end
   end
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index 9f142727ebb..8b114d6d5d8 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -46,7 +46,7 @@ module Gitlab
           valid? && persisted?
         end
 
-        def save(provider = 'OAuth')
+        def save(provider = protocol_name)
           raise SigninDisabledForProviderError if oauth_provider_disabled?
           raise SignupDisabledError unless gl_user
 
@@ -96,6 +96,10 @@ module Gitlab
           end
         end
 
+        def protocol_name
+          'OAuth'
+        end
+
         protected
 
         def should_save?
diff --git a/lib/gitlab/auth/saml/user.rb b/lib/gitlab/auth/saml/user.rb
index 205d5fe0015..d14da41deb6 100644
--- a/lib/gitlab/auth/saml/user.rb
+++ b/lib/gitlab/auth/saml/user.rb
@@ -11,10 +11,6 @@ module Gitlab
       class User < Gitlab::Auth::OAuth::User
         extend ::Gitlab::Utils::Override
 
-        def save
-          super('SAML')
-        end
-
         def find_user
           user = find_by_uid_and_provider
 
@@ -40,6 +36,10 @@ module Gitlab
           saml_config.upstream_two_factor_authn_contexts&.include?(auth_hash.authn_context)
         end
 
+        def protocol_name
+          'SAML'
+        end
+
         protected
 
         def saml_config