Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 1 deletions

diff --git a/db/post_migrate/20191128162854_drop_project_ci_cd_settings_merge_trains_enabled.rb b/db/post_migrate/20191128162854_drop_project_ci_cd_settings_merge_trains_enabled.rb
new file mode 100644
index 00000000000..df5c6c8f6cc
--- /dev/null
+++ b/db/post_migrate/20191128162854_drop_project_ci_cd_settings_merge_trains_enabled.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropProjectCiCdSettingsMergeTrainsEnabled < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    remove_column :project_ci_cd_settings, :merge_trains_enabled
+  end
+
+  def down
+    add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e0f419f1a74..89bace22df6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3098,7 +3098,6 @@ ActiveRecord::Schema.define(version: 2020_01_08_155731) do
     t.integer "project_id", null: false
     t.boolean "group_runners_enabled", default: true, null: false
     t.boolean "merge_pipelines_enabled"
-    t.boolean "merge_trains_enabled", default: false, null: false
     t.integer "default_git_depth"
     t.index ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true
   end