Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 11 deletions

diff --git a/app/workers/database/batched_background_migration/ci_database_worker.rb b/app/workers/database/batched_background_migration/ci_database_worker.rb
index ee9cbba7076..b04db87631a 100644
--- a/app/workers/database/batched_background_migration/ci_database_worker.rb
+++ b/app/workers/database/batched_background_migration/ci_database_worker.rb
@@ -4,12 +4,8 @@ module Database
     class CiDatabaseWorker # rubocop:disable Scalability/IdempotentWorker
       include SingleDatabaseWorker
 
-      def self.enabled?
-        Feature.enabled?(:execute_batched_migrations_on_schedule_ci_database, type: :ops)
-      end
-
       def self.tracking_database
-        @tracking_database ||= Gitlab::Database::CI_DATABASE_NAME
+        @tracking_database ||= Gitlab::Database::CI_DATABASE_NAME.to_sym
       end
     end
   end
diff --git a/app/workers/database/batched_background_migration/single_database_worker.rb b/app/workers/database/batched_background_migration/single_database_worker.rb
index 8a0de268048..cfbd44ba397 100644
--- a/app/workers/database/batched_background_migration/single_database_worker.rb
+++ b/app/workers/database/batched_background_migration/single_database_worker.rb
@@ -24,11 +24,11 @@ module Database
         def tracking_database
           raise NotImplementedError, "#{self.name} does not implement #{__method__}"
         end
+        # :nocov:
 
         def enabled?
-          raise NotImplementedError, "#{self.name} does not implement #{__method__}"
+          Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops)
         end
-        # :nocov:
 
         def lease_key
           name.demodulize.underscore
diff --git a/app/workers/database/batched_background_migration_worker.rb b/app/workers/database/batched_background_migration_worker.rb
index 31208d7a473..29804be832d 100644
--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@@ -4,10 +4,6 @@ module Database
   class BatchedBackgroundMigrationWorker # rubocop:disable Scalability/IdempotentWorker
     include BatchedBackgroundMigration::SingleDatabaseWorker
 
-    def self.enabled?
-      Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops)
-    end
-
     def self.tracking_database
       @tracking_database ||= Gitlab::Database::MAIN_DATABASE_NAME.to_sym
     end