From 10dcfac1f17cffbbc542d47bdf27b682ab453dd2 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Thu, 6 Jun 2019 13:57:50 +0000
Subject: Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"

This reverts merge request !28743
---
 ...4071727_add_ssl_valid_period_to_pages_domain.rb | 16 ----------
 ...ill_valid_time_for_pages_domain_certificates.rb | 34 ----------------------
 db/schema.rb                                       |  2 --
 3 files changed, 52 deletions(-)
 delete mode 100644 db/migrate/20190524071727_add_ssl_valid_period_to_pages_domain.rb
 delete mode 100644 db/post_migrate/20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb

(limited to 'db')

diff --git a/db/migrate/20190524071727_add_ssl_valid_period_to_pages_domain.rb b/db/migrate/20190524071727_add_ssl_valid_period_to_pages_domain.rb
deleted file mode 100644
index 18544dcb6d3..00000000000
--- a/db/migrate/20190524071727_add_ssl_valid_period_to_pages_domain.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddSslValidPeriodToPagesDomain < ActiveRecord::Migration[5.1]
-  include Gitlab::Database::MigrationHelpers
-
-  # Set this constant to true if this migration requires downtime.
-  DOWNTIME = false
-
-  def change
-    add_column :pages_domains, :certificate_valid_not_before, :datetime_with_timezone
-    add_column :pages_domains, :certificate_valid_not_after, :datetime_with_timezone
-  end
-end
diff --git a/db/post_migrate/20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb b/db/post_migrate/20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb
deleted file mode 100644
index 1d8510e4514..00000000000
--- a/db/post_migrate/20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class ScheduleFillValidTimeForPagesDomainCertificates < ActiveRecord::Migration[5.1]
-  include Gitlab::Database::MigrationHelpers
-
-  MIGRATION = 'FillValidTimeForPagesDomainCertificate'
-  BATCH_SIZE = 500
-  BATCH_TIME = 5.minutes
-
-  # Set this constant to true if this migration requires downtime.
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  class PagesDomain < ActiveRecord::Base
-    include ::EachBatch
-
-    self.table_name = 'pages_domains'
-  end
-
-  def up
-    queue_background_migration_jobs_by_range_at_intervals(
-      PagesDomain.where.not(certificate: [nil, '']),
-      MIGRATION,
-      BATCH_TIME,
-      batch_size: BATCH_SIZE)
-  end
-
-  def down
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index a144c3a97ff..fcf9e397ac1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1583,8 +1583,6 @@ ActiveRecord::Schema.define(version: 20190530154715) do
     t.datetime_with_timezone "enabled_until"
     t.datetime_with_timezone "remove_at"
     t.boolean "auto_ssl_enabled", default: false, null: false
-    t.datetime_with_timezone "certificate_valid_not_before"
-    t.datetime_with_timezone "certificate_valid_not_after"
     t.index ["domain"], name: "index_pages_domains_on_domain", unique: true, using: :btree
     t.index ["project_id", "enabled_until"], name: "index_pages_domains_on_project_id_and_enabled_until", using: :btree
     t.index ["project_id"], name: "index_pages_domains_on_project_id", using: :btree
-- 
cgit v1.2.1