diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-01 21:08:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-01 21:08:40 +0300 |
| commit | a8be0f7506339309e264218deffa008bfdf2d9cc (patch) | |
| tree | 95c07d590f7ab8e84fb3e65c81d2561d78ff65e1 /app/workers/database | |
| parent | e1faff6544efe7f1b31e0e73312e7b832c00e6a4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/database')
| -rw-r--r-- | app/workers/database/batched_background_migration/execution_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/database/batched_background_migration/single_database_worker.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/workers/database/batched_background_migration/execution_worker.rb b/app/workers/database/batched_background_migration/execution_worker.rb index 1bdc829418a..75798f0ab73 100644 --- a/app/workers/database/batched_background_migration/execution_worker.rb +++ b/app/workers/database/batched_background_migration/execution_worker.rb @@ -64,6 +64,8 @@ module Database attr_accessor :database_name, :migration def enabled? + return false if Feature.enabled?(:disallow_database_ddl_feature_flags, type: :ops) + Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops) 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 ebf63d34cbf..f73f8fd751b 100644 --- a/app/workers/database/batched_background_migration/single_database_worker.rb +++ b/app/workers/database/batched_background_migration/single_database_worker.rb @@ -27,6 +27,8 @@ module Database # :nocov: def enabled? + return false if Feature.enabled?(:disallow_database_ddl_feature_flags, type: :ops) + Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops) end |