From 6bbc380127d64dcb1dd755dd8082e619fe71bf4e Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 19 Feb 2019 17:49:12 +0900 Subject: Add project level config for merge pipelines Add schema Add CE counter part Add default value for Add changelog Fix schema Add test Fix schema Fix schema version Remove default value for --- ...215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb | 11 +++++++++++ db/schema.rb | 1 + 2 files changed, 12 insertions(+) create mode 100644 db/migrate/20190215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb (limited to 'db') diff --git a/db/migrate/20190215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb b/db/migrate/20190215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb new file mode 100644 index 00000000000..2a2a216da7d --- /dev/null +++ b/db/migrate/20190215154930_add_merge_pipelines_enabled_to_ci_cd_settings.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddMergePipelinesEnabledToCiCdSettings < ActiveRecord::Migration[5.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :project_ci_cd_settings, :merge_pipelines_enabled, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index d4166e32112..7dfa9222278 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1575,6 +1575,7 @@ ActiveRecord::Schema.define(version: 20190220150130) do create_table "project_ci_cd_settings", force: :cascade do |t| t.integer "project_id", null: false t.boolean "group_runners_enabled", default: true, null: false + t.boolean "merge_pipelines_enabled" t.index ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true, using: :btree end -- cgit v1.2.3