diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 18:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 18:08:49 +0000 |
| commit | d551c55bb0e691f06655bcda5fe9566164fd3e46 (patch) | |
| tree | 66320e68b9c2d3567bfbde9ad171e9543186a462 /generator_templates | |
| parent | 9c191c0b942eb08360f4d64c038c435b1156e15f (diff) | |
| download | gitlab-ce-d551c55bb0e691f06655bcda5fe9566164fd3e46.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'generator_templates')
| -rw-r--r-- | generator_templates/active_record/migration/migration.rb | 5 | ||||
| -rw-r--r-- | generator_templates/post_deployment_migration/post_deployment_migration/migration.rb | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/generator_templates/active_record/migration/migration.rb b/generator_templates/active_record/migration/migration.rb index dddd6e247d4..103c2fd7ea2 100644 --- a/generator_templates/active_record/migration/migration.rb +++ b/generator_templates/active_record/migration/migration.rb @@ -3,10 +3,7 @@ # See https://docs.gitlab.com/ee/development/migration_style_guide.html # for more information on how to write migrations for GitLab. -class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>] - # Uncomment the following include if you require helper functions: - # include Gitlab::Database::MigrationHelpers - +class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Database::Migration.current_version %>] # 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. diff --git a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb index 689d1de9d17..c456fa29ea8 100644 --- a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb +++ b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb @@ -3,10 +3,7 @@ # See https://docs.gitlab.com/ee/development/migration_style_guide.html # for more information on how to write migrations for GitLab. -class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>] - # Uncomment the following include if you require helper functions: - # include Gitlab::Database::MigrationHelpers - +class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Database::Migration.current_version %>] # 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. @@ -20,6 +17,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi # comments: # disable_ddl_transaction! - def change + def up + end + + def down end end |