Merge branch 'mc/feature/required-template-inclusion-single-commit-ce' into 'master'

Enforce template inclusion in pipelines - CE

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

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 b003fdd5a9b..20e0050ac61 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -194,6 +194,7 @@ ActiveRecord::Schema.define(version: 20190613030606) 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.boolean "default_project_deletion_protection", default: false, null: false
     t.boolean "lock_memberships_to_ldap", default: false, null: false