Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config.rb b/lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config.rb
index 29fa0f18448..3c142327e94 100644
--- a/lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config.rb
+++ b/lib/gitlab/background_migration/backfill_project_fullpath_in_repo_config.rb
@@ -171,7 +171,11 @@ module Gitlab
         end
 
         def schedule_retry(project, retry_count)
-          BackgroundMigrationWorker.perform_in(RETRY_DELAY, self.class::RetryOne.name, [project.id, retry_count])
+          # Constants provided to BackgroundMigrationWorker must be within the
+          # scope of Gitlab::BackgroundMigration
+          retry_class_name = self.class::RetryOne.name.sub('Gitlab::BackgroundMigration::', '')
+
+          BackgroundMigrationWorker.perform_in(RETRY_DELAY, retry_class_name, [project.id, retry_count])
         end
       end