diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-24 06:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-24 06:07:44 +0300 |
| commit | f41ba400eb6320979eccaec747bc1a80c14fbe15 (patch) | |
| tree | 590b37197246762cececd1ad4e0107f88507fe0f /generator_templates | |
| parent | 1dd92924325105bb04d8900ac2577e59eb39f603 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'generator_templates')
| -rw-r--r-- | generator_templates/active_record/migration/create_table_migration.rb.tt | 1 | ||||
| -rw-r--r-- | generator_templates/active_record/migration/migration.rb.tt | 1 |
2 files changed, 2 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 e3eae729139..fbd21c28387 100644 --- a/generator_templates/active_record/migration/create_table_migration.rb.tt +++ b/generator_templates/active_record/migration/create_table_migration.rb.tt @@ -16,6 +16,7 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # To disable transactions uncomment the following line and remove these # comments: # disable_ddl_transaction! + milestone '<%= Gitlab.current_milestone %>' # Add dependent 'batched_background_migrations.queued_migration_version' values. # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] diff --git a/generator_templates/active_record/migration/migration.rb.tt b/generator_templates/active_record/migration/migration.rb.tt index 40481aed6ea..a8e715789e6 100644 --- a/generator_templates/active_record/migration/migration.rb.tt +++ b/generator_templates/active_record/migration/migration.rb.tt @@ -23,6 +23,7 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # Add dependent 'batched_background_migrations.queued_migration_version' values. # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + milestone '<%= Gitlab.current_milestone %>' <%- if migration_action == 'add' -%> def change |