diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 00:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 00:09:13 +0300 |
| commit | 659ad26b4e0e1f792ab6d15ac8d6e47ec943e214 (patch) | |
| tree | 5e395d172b681cfe396c671ebf7eef8789ef7334 /generator_templates | |
| parent | e93121b42cb4ca672c893c6be0a8af0c8d9f7987 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'generator_templates')
3 files changed, 6 insertions, 6 deletions
diff --git a/generator_templates/active_record/migration/create_table_migration.rb b/generator_templates/active_record/migration/create_table_migration.rb index 91df1b0d98f..e8e46202c44 100644 --- a/generator_templates/active_record/migration/create_table_migration.rb +++ b/generator_templates/active_record/migration/create_table_migration.rb @@ -14,8 +14,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi # migration requires downtime. # DOWNTIME_REASON = '' - # When using the methods "add_concurrent_index", "remove_concurrent_index" or - # "add_column_with_default" you must disable the use of transactions + # When using the methods "add_concurrent_index" or "remove_concurrent_index" + # you must disable the use of transactions # as these methods can not run in an existing transaction. # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure # that either of them is the _only_ method called in the migration, diff --git a/generator_templates/active_record/migration/migration.rb b/generator_templates/active_record/migration/migration.rb index 2a57edba65e..1a1ab7eba94 100644 --- a/generator_templates/active_record/migration/migration.rb +++ b/generator_templates/active_record/migration/migration.rb @@ -15,8 +15,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi # migration requires downtime. # DOWNTIME_REASON = '' - # When using the methods "add_concurrent_index", "remove_concurrent_index" or - # "add_column_with_default" you must disable the use of transactions + # When using the methods "add_concurrent_index" or "remove_concurrent_index" + # you must disable the use of transactions # as these methods can not run in an existing transaction. # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure # that either of them is the _only_ method called in the migration, diff --git a/generator_templates/rails/post_deployment_migration/migration.rb b/generator_templates/rails/post_deployment_migration/migration.rb index b36cf877f0e..c76d318c5d6 100644 --- a/generator_templates/rails/post_deployment_migration/migration.rb +++ b/generator_templates/rails/post_deployment_migration/migration.rb @@ -9,8 +9,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi DOWNTIME = false - # When using the methods "add_concurrent_index", "remove_concurrent_index" or - # "add_column_with_default" you must disable the use of transactions + # When using the methods "add_concurrent_index" or "remove_concurrent_index" + # you must disable the use of transactions # as these methods can not run in an existing transaction. # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure # that either of them is the _only_ method called in the migration, |