From d6536fde92f354442aa985fcc65c94154389086e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sun, 23 Jun 2019 15:54:04 -0700 Subject: Promote import column migration into pre-deployment migration Since the `ignore_column` was removed, we need to make sure we remove the column so that Unicorn and Sidekiq don't need to be HUP'ed again. --- .../20190619175843_remove_import_columns_from_projects.rb | 14 ++++++++++++++ .../20190619175843_remove_import_columns_from_projects.rb | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20190619175843_remove_import_columns_from_projects.rb delete mode 100644 db/post_migrate/20190619175843_remove_import_columns_from_projects.rb diff --git a/db/migrate/20190619175843_remove_import_columns_from_projects.rb b/db/migrate/20190619175843_remove_import_columns_from_projects.rb new file mode 100644 index 00000000000..85f776ac99c --- /dev/null +++ b/db/migrate/20190619175843_remove_import_columns_from_projects.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveImportColumnsFromProjects < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + remove_column :projects, :import_status, :string + remove_column :projects, :import_jid, :string + remove_column :projects, :import_error, :text + end +end diff --git a/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb b/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb deleted file mode 100644 index 85f776ac99c..00000000000 --- a/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -class RemoveImportColumnsFromProjects < ActiveRecord::Migration[5.1] - include Gitlab::Database::MigrationHelpers - - # Set this constant to true if this migration requires downtime. - DOWNTIME = false - - def change - remove_column :projects, :import_status, :string - remove_column :projects, :import_jid, :string - remove_column :projects, :import_error, :text - end -end -- cgit v1.2.1