Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/gitlab/database/background_migration/batched_migration_wrapper.rb b/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
index ad747a8131d..f1fc3efae9e 100644
--- a/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
+++ b/lib/gitlab/database/background_migration/batched_migration_wrapper.rb
@@ -49,6 +49,8 @@ module Gitlab
         def execute_job(tracking_record)
           job_class = tracking_record.migration_job_class
 
+          ApplicationContext.push(feature_category: fetch_feature_category(job_class))
+
           if job_class < Gitlab::BackgroundMigration::BatchedMigrationJob
             execute_batched_migration_job(job_class, tracking_record)
           else
@@ -86,6 +88,14 @@ module Gitlab
 
           job_instance
         end
+
+        def fetch_feature_category(job_class)
+          if job_class.respond_to?(:feature_category)
+            job_class.feature_category.to_s
+          else
+            Gitlab::BackgroundMigration::BatchedMigrationJob::DEFAULT_FEATURE_CATEGORY
+          end
+        end
       end
     end
   end