From d551c55bb0e691f06655bcda5fe9566164fd3e46 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Sep 2021 18:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- generator_templates/active_record/migration/migration.rb | 5 +---- .../post_deployment_migration/migration.rb | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'generator_templates') 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 -- cgit v1.2.1