Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 1 deletions

diff --git a/db/migrate/20210212163231_add_merge_when_pipeline_succeeds_to_notification_settings.rb b/db/migrate/20210212163231_add_merge_when_pipeline_succeeds_to_notification_settings.rb
new file mode 100644
index 00000000000..08d0a99436e
--- /dev/null
+++ b/db/migrate/20210212163231_add_merge_when_pipeline_succeeds_to_notification_settings.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddMergeWhenPipelineSucceedsToNotificationSettings < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :notification_settings, :merge_when_pipeline_succeeds, :boolean, default: false, null: false
+  end
+end
diff --git a/db/schema_migrations/20210212163231 b/db/schema_migrations/20210212163231
new file mode 100644
index 00000000000..e0ba3d83bf5
--- /dev/null
+++ b/db/schema_migrations/20210212163231
@@ -0,0 +1 @@
+4c6061f6ab1cb9e070a3ae87d44caf12d2c110a6033f0b33898b4b7ea7e37055
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 0c69654f13e..3507cb74614 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14530,7 +14530,8 @@ CREATE TABLE notification_settings (
     fixed_pipeline boolean,
     new_release boolean,
     moved_project boolean DEFAULT true NOT NULL,
-    change_reviewer_merge_request boolean
+    change_reviewer_merge_request boolean,
+    merge_when_pipeline_succeeds boolean DEFAULT false NOT NULL
 );
 
 CREATE SEQUENCE notification_settings_id_seq