diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 18:07:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 18:07:34 +0300 |
commit | 8b61452138ecc511b52cd49be4ee6b8a80390c50 (patch) | |
tree | 122b817432c2a0f0e23767bd95791a89b20540c0 /db | |
parent | f864f8a7aafa45b0e4c04e4312f89da4b1227c0f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191217212348_add_modsecurity_enabled_to_ingress_application.rb | 16 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/db/migrate/20191217212348_add_modsecurity_enabled_to_ingress_application.rb b/db/migrate/20191217212348_add_modsecurity_enabled_to_ingress_application.rb new file mode 100644 index 00000000000..2690a5762dd --- /dev/null +++ b/db/migrate/20191217212348_add_modsecurity_enabled_to_ingress_application.rb @@ -0,0 +1,16 @@ +# 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 AddModsecurityEnabledToIngressApplication < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def up + add_column :clusters_applications_ingress, :modsecurity_enabled, :boolean + end + + def down + remove_column :clusters_applications_ingress, :modsecurity_enabled + end +end diff --git a/db/schema.rb b/db/schema.rb index dee28ea4287..0f709482884 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1163,6 +1163,7 @@ ActiveRecord::Schema.define(version: 2019_12_18_225624) do t.text "status_reason" t.string "external_ip" t.string "external_hostname" + t.boolean "modsecurity_enabled" t.index ["cluster_id"], name: "index_clusters_applications_ingress_on_cluster_id", unique: true end |