Remove content_type and add acme kit to settings

3 files changed, 17 insertions, 3 deletions

diff --git a/db/migrate/20190320102348_create_pages_domains_acme_challenges.rb b/db/migrate/20190320102348_create_pages_domains_acme_challenges.rb
index 0873c9d5511..c108ff0932e 100644
--- a/db/migrate/20190320102348_create_pages_domains_acme_challenges.rb
+++ b/db/migrate/20190320102348_create_pages_domains_acme_challenges.rb
@@ -14,7 +14,6 @@ class CreatePagesDomainsAcmeChallenges < ActiveRecord::Migration[5.0]
 
       t.string :url, null: false
       t.string :token, null: false
-      t.string :content_type, null: false
       t.text :file_content, null: false
 
       t.timestamps_with_timezone null: false
diff --git a/db/migrate/20190321101734_add_acme_kid_to_applicaiton_settings.rb b/db/migrate/20190321101734_add_acme_kid_to_applicaiton_settings.rb
new file mode 100644
index 00000000000..95b4e917e52
--- /dev/null
+++ b/db/migrate/20190321101734_add_acme_kid_to_applicaiton_settings.rb
@@ -0,0 +1,15 @@
+# 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 AddAcmeKidToApplicaitonSettings < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def change
+    add_column :application_settings, :acme_account_kid, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 082a2793a60..ea2f63d5c89 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190320174702) do
+ActiveRecord::Schema.define(version: 20190321101734) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -178,6 +178,7 @@ ActiveRecord::Schema.define(version: 20190320174702) do
     t.integer "local_markdown_version", default: 0, null: false
     t.integer "first_day_of_week", default: 0, null: false
     t.text "acme_private_key"
+    t.string "acme_account_kid"
     t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
   end
 
@@ -1517,7 +1518,6 @@ ActiveRecord::Schema.define(version: 20190320174702) do
     t.integer "pages_domain_id", null: false
     t.string "url", null: false
     t.string "token", null: false
-    t.string "content_type", null: false
     t.text "file_content", null: false
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false