diff options
Diffstat (limited to 'app/services')
4 files changed, 5 insertions, 22 deletions
diff --git a/app/services/concerns/update_repository_storage_methods.rb b/app/services/concerns/update_repository_storage_methods.rb index b21d05f4178..a0b4040cff7 100644 --- a/app/services/concerns/update_repository_storage_methods.rb +++ b/app/services/concerns/update_repository_storage_methods.rb @@ -28,10 +28,7 @@ module UpdateRepositoryStorageMethods track_repository(destination_storage_name) end - unless same_filesystem? - remove_old_paths - enqueue_housekeeping - end + remove_old_paths unless same_filesystem? repository_storage_move.finish_cleanup! @@ -95,10 +92,6 @@ module UpdateRepositoryStorageMethods end end - def enqueue_housekeeping - # no-op - end - def wait_for_pushes(type) reference_counter = container.reference_counter(type: type) diff --git a/app/services/packages/debian/generate_distribution_service.rb b/app/services/packages/debian/generate_distribution_service.rb index 2ced2e5f275..ee43fe208c9 100644 --- a/app/services/packages/debian/generate_distribution_service.rb +++ b/app/services/packages/debian/generate_distribution_service.rb @@ -269,7 +269,7 @@ module Packages # used by ExclusiveLeaseGuard def lease_key - "packages:debian:generate_distribution_service:distribution:#{@distribution.id}" + "packages:debian:generate_distribution_service:#{@distribution.class.container_type}_distribution:#{@distribution.id}" end # used by ExclusiveLeaseGuard diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb index 7c63216af5e..cadf3012131 100644 --- a/app/services/projects/update_repository_storage_service.rb +++ b/app/services/projects/update_repository_storage_service.rb @@ -25,19 +25,6 @@ module Projects end end - # The underlying FetchInternalRemote call uses a `git fetch` to move data - # to the new repository, which leaves it in a less-well-packed state, - # lacking bitmaps and commit graphs. Housekeeping will boost performance - # significantly. - def enqueue_housekeeping - return unless Gitlab::CurrentSettings.housekeeping_enabled? - return unless Feature.enabled?(:repack_after_shard_migration, project) - - Repositories::HousekeepingService.new(project, :gc).execute - rescue Repositories::HousekeepingService::LeaseTaken - # No action required - end - def remove_old_paths super diff --git a/app/services/users/validate_manual_otp_service.rb b/app/services/users/validate_manual_otp_service.rb index 96a827db13c..8ba76f5f593 100644 --- a/app/services/users/validate_manual_otp_service.rb +++ b/app/services/users/validate_manual_otp_service.rb @@ -3,6 +3,7 @@ module Users class ValidateManualOtpService < BaseService include ::Gitlab::Auth::Otp::Fortinet + include ::Gitlab::Auth::Otp::DuoAuth def initialize(current_user) @current_user = current_user @@ -10,6 +11,8 @@ module Users ::Gitlab::Auth::Otp::Strategies::FortiAuthenticator::ManualOtp.new(current_user) elsif forti_token_cloud_enabled?(current_user) ::Gitlab::Auth::Otp::Strategies::FortiTokenCloud.new(current_user) + elsif duo_auth_enabled?(current_user) + ::Gitlab::Auth::Otp::Strategies::DuoAuth::ManualOtp.new(current_user) else ::Gitlab::Auth::Otp::Strategies::Devise.new(current_user) end |