Merge branch 'reduce-omniauth_callbacks_controller-diff-with-ce' into 'master'

Reduce diff with CE in OmniauthCallbacksController

See merge request gitlab-org/gitlab-ee!8891

app/controllers/omniauth_callbacks_controller.rb

@@ -3,6 +3,7 @@
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include AuthenticatesWithTwoFactor
   include Devise::Controllers::Rememberable
+
   protect_from_forgery except: [:kerberos, :saml, :cas3], prepend: true
 
   def handle_omniauth
@@ -55,16 +56,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     handle_omniauth
   end
 
-  def kerberos_spnego
-    # The internal kerberos_spnego provider is a replacement for
-    # omniauth-kerberos. Here we re-use the 'kerberos' provider name to ease
-    # the transition. In time (in GitLab 9.0?) we should remove the
-    # omniauth-kerberos gem and rename the internal 'kerberos_spnego'
-    # provider to plain 'kerberos' and remove this special method.
-    oauth['provider'] = 'kerberos'
-    handle_omniauth
-  end
-
   def authentiq
     if params['sid']
       handle_service_ticket oauth['provider'], params['sid']

ee/app/controllers/ee/omniauth_callbacks_controller.rb

@@ -4,6 +4,16 @@ module EE
   module OmniauthCallbacksController
     extend ::Gitlab::Utils::Override
 
+    def kerberos_spnego
+      # The internal kerberos_spnego provider is a replacement for
+      # omniauth-kerberos. Here we re-use the 'kerberos' provider name to ease
+      # the transition. In time (in GitLab 9.0?) we should remove the
+      # omniauth-kerberos gem and rename the internal 'kerberos_spnego'
+      # provider to plain 'kerberos' and remove this special method.
+      oauth['provider'] = 'kerberos'
+      handle_omniauth
+    end
+
     protected
 
     override :fail_login