Merge branch 'reset-settings-column-info' into 'master'

Reload ApplicationSetting column information before use See merge request gitlab-org/gitlab-ee!9501

Merge branch 'reset-settings-column-info' into 'master'
Reload ApplicationSetting column information before use See merge request gitlab-org/gitlab-ee!9501
6d6a07ce · Stan Hu · cbe25d50 · e713e902 · 6d6a07ce
Commit 6d6a07ce authored Feb 11, 2019 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

ee/db/migrate/20190114040405_consume_remaining_migrate_approver_to_approval_rules_in_batch_jobs.rb ...ining_migrate_approver_to_approval_rules_in_batch_jobs.rb +2 -0

No files found.
--- a/ee/db/migrate/20190114040405_consume_remaining_migrate_approver_to_approval_rules_in_batch_jobs.rb
+++ b/ee/db/migrate/20190114040405_consume_remaining_migrate_approver_to_approval_rules_in_batch_jobs.rb
@@ -35,6 +35,8 @@ class ConsumeRemainingMigrateApproverToApprovalRulesInBatchJobs < ActiveRecord::
  disable_ddl_transaction!

  def up
+    ApplicationSetting.reset_column_information
+
    Gitlab::BackgroundMigration.steal('MigrateApproverToApprovalRulesInBatch', retry_dead_jobs: true)

    process_unmigrated