summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2019-06-06 20:53:56 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-06-12 17:50:30 +0200
commitaab368056e5eca571c353d31b26adf046c8e41d6 (patch)
treeeef1d8983bc4537b59963aba8e167cb8d21bd9b3
parent68a1ba6a296f340fcddf58e5fbd26d51d66bd90b (diff)
downloadgitlab-ce-mc/feature/required-template-inclusion-single-commit-ce-db.tar.gz
Backports db changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14011
-rw-r--r--db/migrate/20190527011309_add_required_template_name_to_application_settings.rb15
-rw-r--r--db/schema.rb1
2 files changed, 16 insertions, 0 deletions
diff --git a/db/migrate/20190527011309_add_required_template_name_to_application_settings.rb b/db/migrate/20190527011309_add_required_template_name_to_application_settings.rb
new file mode 100644
index 00000000000..6cbac0ed507
--- /dev/null
+++ b/db/migrate/20190527011309_add_required_template_name_to_application_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 AddRequiredTemplateNameToApplicationSettings < ActiveRecord::Migration[5.1]
+ include Gitlab::Database::MigrationHelpers
+
+ # Set this constant to true if this migration requires downtime.
+ DOWNTIME = false
+
+ def change
+ add_column :application_settings, :required_instance_ci_template, :string, null: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fcf9e397ac1..1b4e50ffd6e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -193,6 +193,7 @@ ActiveRecord::Schema.define(version: 20190530154715) do
t.integer "elasticsearch_replicas", default: 1, null: false
t.text "encrypted_lets_encrypt_private_key"
t.text "encrypted_lets_encrypt_private_key_iv"
+ t.string "required_instance_ci_template"
t.boolean "dns_rebinding_protection_enabled", default: true, null: false
t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
end