diff options
Diffstat (limited to 'app/controllers/repositories')
-rw-r--r-- | app/controllers/repositories/git_http_client_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/repositories/git_http_controller.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/repositories/git_http_client_controller.rb b/app/controllers/repositories/git_http_client_controller.rb index fbf5d82a45b..a5ca17db113 100644 --- a/app/controllers/repositories/git_http_client_controller.rb +++ b/app/controllers/repositories/git_http_client_controller.rb @@ -3,7 +3,7 @@ module Repositories class GitHttpClientController < Repositories::ApplicationController include ActionController::HttpAuthentication::Basic - include KerberosSpnegoHelper + include KerberosHelper include Gitlab::Utils::StrongMemoize attr_reader :authentication_result, :redirected_path @@ -49,7 +49,7 @@ module Repositories if handle_basic_authentication(login, password) return # Allow access end - elsif allow_kerberos_spnego_auth? && spnego_provided? + elsif allow_kerberos_auth? && spnego_provided? kerberos_user = find_kerberos_user if kerberos_user @@ -91,7 +91,7 @@ module Repositories def send_challenges challenges = [] challenges << 'Basic realm="GitLab"' if allow_basic_auth? - challenges << spnego_challenge if allow_kerberos_spnego_auth? + challenges << spnego_challenge if allow_kerberos_auth? headers['Www-Authenticate'] = challenges.join("\n") if challenges.any? end diff --git a/app/controllers/repositories/git_http_controller.rb b/app/controllers/repositories/git_http_controller.rb index c3c6a51239d..144ec4c0de9 100644 --- a/app/controllers/repositories/git_http_controller.rb +++ b/app/controllers/repositories/git_http_controller.rb @@ -83,7 +83,7 @@ module Repositories return if Gitlab::Database.read_only? return unless repo_type.project? - OnboardingProgressService.async(project.namespace_id).execute(action: :git_pull) + Onboarding::ProgressService.async(project.namespace_id).execute(action: :git_pull) return if Feature.enabled?(:disable_git_http_fetch_writes) |