diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 03:11:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 03:11:11 +0300 |
| commit | eb9f5ce5d9ec0c5dd4954ffe448214ae8eb144ac (patch) | |
| tree | 32a97b1bb6c3b3f317683e649d2e4d9991464bde /generator_templates | |
| parent | d6f2690ceeffc5306381618473cc4e3e613ebecf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'generator_templates')
3 files changed, 9 insertions, 0 deletions
diff --git a/generator_templates/active_record/migration/create_table_migration.rb.tt b/generator_templates/active_record/migration/create_table_migration.rb.tt index 0b0cb05249c..e3eae729139 100644 --- a/generator_templates/active_record/migration/create_table_migration.rb.tt +++ b/generator_templates/active_record/migration/create_table_migration.rb.tt @@ -17,6 +17,9 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # comments: # disable_ddl_transaction! + # Add dependent 'batched_background_migrations.queued_migration_version' values. + # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + def change create_table :<%= table_name %> do |t| <% attributes.each do |attribute| -%> diff --git a/generator_templates/active_record/migration/migration.rb.tt b/generator_templates/active_record/migration/migration.rb.tt index 50d2b018ae7..40481aed6ea 100644 --- a/generator_templates/active_record/migration/migration.rb.tt +++ b/generator_templates/active_record/migration/migration.rb.tt @@ -21,6 +21,9 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # Visit: https://docs.gitlab.com/ee/development/database/migrations_for_multiple_databases.html # restrict_gitlab_migration gitlab_schema: :gitlab_main + # Add dependent 'batched_background_migrations.queued_migration_version' values. + # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + <%- if migration_action == 'add' -%> def change <% attributes.each do |attribute| -%> diff --git a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt index dcc9d1e4563..dbce7eb201e 100644 --- a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt +++ b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt @@ -21,6 +21,9 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # Visit: https://docs.gitlab.com/ee/development/database/migrations_for_multiple_databases.html # restrict_gitlab_migration gitlab_schema: :gitlab_main + # Add dependent 'batched_background_migrations.queued_migration_version' values. + # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + def up end |