Add latest changes from gitlab-org/gitlab@master

5 files changed, 26 insertions, 0 deletions

diff --git a/db/migrate/20211111164025_add_squash_commit_template_to_project_settings.rb b/db/migrate/20211111164025_add_squash_commit_template_to_project_settings.rb
new file mode 100644
index 00000000000..6120a6ed0b4
--- /dev/null
+++ b/db/migrate/20211111164025_add_squash_commit_template_to_project_settings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSquashCommitTemplateToProjectSettings < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def change
+    add_column :project_settings, :squash_commit_template, :text # rubocop:disable Migration/AddLimitToTextColumns
+  end
+end
diff --git a/db/migrate/20211111164047_add_squash_commit_template_limit_to_project_settings.rb b/db/migrate/20211111164047_add_squash_commit_template_limit_to_project_settings.rb
new file mode 100644
index 00000000000..578d2271d60
--- /dev/null
+++ b/db/migrate/20211111164047_add_squash_commit_template_limit_to_project_settings.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddSquashCommitTemplateLimitToProjectSettings < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :project_settings, :squash_commit_template, 500
+  end
+
+  def down
+    remove_text_limit :project_settings, :squash_commit_template
+  end
+end
diff --git a/db/schema_migrations/20211111164025 b/db/schema_migrations/20211111164025
new file mode 100644
index 00000000000..409cc160b9e
--- /dev/null
+++ b/db/schema_migrations/20211111164025
@@ -0,0 +1 @@
+d78fe687517e14ff67dc76eff63391e33b73d29446d2a0445595175c7cd6806a
\ No newline at end of file
diff --git a/db/schema_migrations/20211111164047 b/db/schema_migrations/20211111164047
new file mode 100644
index 00000000000..30e0875cf73
--- /dev/null
+++ b/db/schema_migrations/20211111164047
@@ -0,0 +1 @@
+c8ed7f8c0f818156dba9c25be848da97d4eb6dbf0aa9c48f87e940f3ca0967d9
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 3db0f0c14e9..1086961ab41 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18299,7 +18299,9 @@ CREATE TABLE project_settings (
     warn_about_potentially_unwanted_characters boolean DEFAULT true NOT NULL,
     merge_commit_template text,
     has_shimo boolean DEFAULT false NOT NULL,
+    squash_commit_template text,
     CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
+    CONSTRAINT check_b09644994b CHECK ((char_length(squash_commit_template) <= 500)),
     CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)),
     CONSTRAINT check_eaf7cfb6a7 CHECK ((char_length(merge_commit_template) <= 500))
 );