Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 3 deletions

diff --git a/app/services/terraform/states/destroy_service.rb b/app/services/terraform/states/destroy_service.rb
index 76fd0f9433d..728533a60ed 100644
--- a/app/services/terraform/states/destroy_service.rb
+++ b/app/services/terraform/states/destroy_service.rb
@@ -11,9 +11,7 @@ module Terraform
         return unless state.deleted_at?
 
         state.versions.each_batch(column: :version) do |batch|
-          batch.each do |version|
-            version.file.remove!
-          end
+          process_batch(batch)
         end
 
         state.destroy!
@@ -22,6 +20,15 @@ module Terraform
       private
 
       attr_reader :state
+
+      # Overridden in EE
+      def process_batch(batch)
+        batch.each do |version|
+          version.file.remove!
+        end
+      end
     end
   end
 end
+
+Terraform::States::DestroyService.prepend_mod