Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/app/models/bulk_imports/tracker.rb b/app/models/bulk_imports/tracker.rb
index cfe33c013ba..a994cc3f8ce 100644
--- a/app/models/bulk_imports/tracker.rb
+++ b/app/models/bulk_imports/tracker.rb
@@ -46,6 +46,7 @@ class BulkImports::Tracker < ApplicationRecord
     state :started, value: 1
     state :finished, value: 2
     state :enqueued, value: 3
+    state :timeout, value: 4
     state :failed, value: -1
     state :skipped, value: -2
 
@@ -76,5 +77,9 @@ class BulkImports::Tracker < ApplicationRecord
     event :fail_op do
       transition any => :failed
     end
+
+    event :cleanup_stale do
+      transition [:created, :started] => :timeout
+    end
   end
 end