Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb
index 61e0a075018..ddd6b11eebb 100644
--- a/lib/gitlab/background_migration.rb
+++ b/lib/gitlab/background_migration.rb
@@ -78,6 +78,20 @@ module Gitlab
     end
 
     def self.migration_class_for(class_name)
+      # We don't pass class name with Gitlab::BackgroundMigration:: prefix anymore
+      # but some jobs could be already spawned so we need to have some backward compatibility period.
+      # Can be removed since 13.x
+      full_class_name_prefix_regexp = /\A(::)?Gitlab::BackgroundMigration::/
+
+      if class_name.match(full_class_name_prefix_regexp)
+        Gitlab::ErrorTracking.track_and_raise_for_dev_exception(
+          StandardError.new("Full class name is used"),
+          class_name: class_name
+        )
+
+        class_name = class_name.sub(full_class_name_prefix_regexp, '')
+      end
+
       const_get(class_name, false)
     end