Merge branch 'pages-domain-letsencrypt-settings' into 'master'

Add auto_ssl_enabled to pages domains

See merge request gitlab-org/gitlab-ce!27304

2 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20190322164830_add_auto_ssl_enabled_to_pages_domain.rb b/db/migrate/20190322164830_add_auto_ssl_enabled_to_pages_domain.rb
new file mode 100644
index 00000000000..e74a9535ddf
--- /dev/null
+++ b/db/migrate/20190322164830_add_auto_ssl_enabled_to_pages_domain.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddAutoSslEnabledToPagesDomain < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :pages_domains, :auto_ssl_enabled, :boolean, default: false
+  end
+
+  def down
+    remove_column :pages_domains, :auto_ssl_enabled
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c0399529deb..d1f369d763a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1548,6 +1548,7 @@ ActiveRecord::Schema.define(version: 20190408163745) do
     t.string "verification_code", null: false
     t.datetime_with_timezone "enabled_until"
     t.datetime_with_timezone "remove_at"
+    t.boolean "auto_ssl_enabled", default: false, null: false
     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