Add latest changes from gitlab-org/gitlab@master

3 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20210128101707_add_prevent_merge_without_jira_issue_to_project_settings.rb b/db/migrate/20210128101707_add_prevent_merge_without_jira_issue_to_project_settings.rb
new file mode 100644
index 00000000000..18f186294f1
--- /dev/null
+++ b/db/migrate/20210128101707_add_prevent_merge_without_jira_issue_to_project_settings.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddPreventMergeWithoutJiraIssueToProjectSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_settings, :prevent_merge_without_jira_issue, :boolean, null: false, default: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_settings, :prevent_merge_without_jira_issue
+    end
+  end
+end
diff --git a/db/schema_migrations/20210128101707 b/db/schema_migrations/20210128101707
new file mode 100644
index 00000000000..f10f080c1df
--- /dev/null
+++ b/db/schema_migrations/20210128101707
@@ -0,0 +1 @@
+ae84fa35fcc5a0780d86887294a32e250d2ac13dcf607750f834df5828e5bece
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 8c1ed479c69..5211776e17f 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16064,6 +16064,7 @@ CREATE TABLE project_settings (
     has_confluence boolean DEFAULT false NOT NULL,
     has_vulnerabilities boolean DEFAULT false NOT NULL,
     allow_editing_commit_messages boolean DEFAULT false NOT NULL,
+    prevent_merge_without_jira_issue boolean DEFAULT false NOT NULL,
     CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL))
 );