diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 09:09:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 09:09:27 +0000 |
commit | 2af90cef2e2e9c776eae4394a43dba3be7f33d1e (patch) | |
tree | bb4bc691caa6cc74b45720ecd779517f9c8c2cd3 /db | |
parent | cf58004721ee715dd3884476f6fa0c62a7e7f247 (diff) | |
download | gitlab-ce-2af90cef2e2e9c776eae4394a43dba3be7f33d1e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200311214912_add_modsecurity_mode_to_ingress_application.rb | 19 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/db/migrate/20200311214912_add_modsecurity_mode_to_ingress_application.rb b/db/migrate/20200311214912_add_modsecurity_mode_to_ingress_application.rb new file mode 100644 index 00000000000..6ca17dc9b55 --- /dev/null +++ b/db/migrate/20200311214912_add_modsecurity_mode_to_ingress_application.rb @@ -0,0 +1,19 @@ +# 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 AddModsecurityModeToIngressApplication < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:clusters_applications_ingress, :modsecurity_mode, :smallint, default: 0, allow_null: false) + end + + def down + remove_column :clusters_applications_ingress, :modsecurity_mode + end +end diff --git a/db/schema.rb b/db/schema.rb index f3a475bbfe9..aed7285e698 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1199,6 +1199,7 @@ ActiveRecord::Schema.define(version: 2020_03_13_123934) do t.string "external_ip" t.string "external_hostname" t.boolean "modsecurity_enabled" + t.integer "modsecurity_mode", limit: 2, default: 0, null: false t.index ["cluster_id"], name: "index_clusters_applications_ingress_on_cluster_id", unique: true end |