Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20200320123839_add_letsencrypt_errors_to_pages_domains.rb b/db/migrate/20200320123839_add_letsencrypt_errors_to_pages_domains.rb
new file mode 100644
index 00000000000..ad4debf9a1e
--- /dev/null
+++ b/db/migrate/20200320123839_add_letsencrypt_errors_to_pages_domains.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddLetsencryptErrorsToPagesDomains < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :pages_domains, :auto_ssl_failed, :boolean, default: false
+  end
+
+  def down
+    remove_column :pages_domains, :auto_ssl_failed
+  end
+end