Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

3 files changed, 0 insertions, 37 deletions

diff --git a/app/services/pages/delete_service.rb b/app/services/pages/delete_service.rb
index f7d3d70aad6..8d33e6c1000 100644
--- a/app/services/pages/delete_service.rb
+++ b/app/services/pages/delete_service.rb
@@ -12,9 +12,6 @@ module Pages
       PagesDomain.for_project(project).delete_all
 
       DestroyPagesDeploymentsWorker.perform_async(project.id)
-
-      # TODO: remove this call https://gitlab.com/gitlab-org/gitlab/-/issues/320775
-      PagesRemoveWorker.perform_async(project.id) if ::Settings.pages.local_store.enabled
     end
   end
 end
diff --git a/app/services/pages/legacy_storage_lease.rb b/app/services/pages/legacy_storage_lease.rb
deleted file mode 100644
index 1849def0183..00000000000
--- a/app/services/pages/legacy_storage_lease.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Pages
-  module LegacyStorageLease
-    extend ActiveSupport::Concern
-
-    include ::ExclusiveLeaseGuard
-
-    LEASE_TIMEOUT = 1.hour
-
-    def lease_key
-      "pages_legacy_storage:#{project.id}"
-    end
-
-    def lease_timeout
-      LEASE_TIMEOUT
-    end
-  end
-end
diff --git a/app/services/pages/migrate_legacy_storage_to_deployment_service.rb b/app/services/pages/migrate_legacy_storage_to_deployment_service.rb
index 95c7107eb62..9c1671fbc15 100644
--- a/app/services/pages/migrate_legacy_storage_to_deployment_service.rb
+++ b/app/services/pages/migrate_legacy_storage_to_deployment_service.rb
@@ -2,10 +2,7 @@
 
 module Pages
   class MigrateLegacyStorageToDeploymentService
-    ExclusiveLeaseTakenError = Class.new(StandardError)
-
     include BaseServiceUtility
-    include ::Pages::LegacyStorageLease
 
     attr_reader :project
 
@@ -16,18 +13,6 @@ module Pages
     end
 
     def execute
-      result = try_obtain_lease do
-        execute_unsafe
-      end
-
-      raise ExclusiveLeaseTakenError, "Can't migrate pages for project #{project.id}: exclusive lease taken" if result.nil?
-
-      result
-    end
-
-    private
-
-    def execute_unsafe
       zip_result = ::Pages::ZipDirectoryService.new(project.pages_path, ignore_invalid_entries: @ignore_invalid_entries).execute
 
       if zip_result[:status] == :error