Add merge commit template column in project settings table

This commit adds merge_commit_template column in project_settings.
It also adds this field to project's model.

app/controllers/projects_controller.rb

@@ -447,6 +447,7 @@ class ProjectsController < Projects::ApplicationController
       :suggestion_commit_message,
       :packages_enabled,
       :service_desk_enabled,
+      :merge_commit_template,
       project_setting_attributes: project_setting_attributes
     ] + [project_feature_attributes: project_feature_attributes]
   end

app/models/project.rb

@@ -452,6 +452,7 @@ class Project < ApplicationRecord
     :allow_merge_on_skipped_pipeline=, :has_confluence?,
     to: :project_setting
   delegate :active?, to: :prometheus_integration, allow_nil: true, prefix: true
+  delegate :merge_commit_template, :merge_commit_template=, to: :project_setting, allow_nil: true
 
   delegate :log_jira_dvcs_integration_usage, :jira_dvcs_server_last_sync_at, :jira_dvcs_cloud_last_sync_at, to: :feature_usage
 

app/models/project_setting.rb

@@ -12,6 +12,8 @@ class ProjectSetting < ApplicationRecord
 
   self.primary_key = :project_id
 
+  validates :merge_commit_template, length: { maximum: 500 }
+
   def squash_enabled_by_default?
     %w[always default_on].include?(squash_option)
   end

db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb

+# frozen_string_literal: true
+
+class AddMergeCommitTemplateToProjectSettings < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def change
+    add_column :project_settings, :merge_commit_template, :text # rubocop:disable Migration/AddLimitToTextColumns
+  end
+end

db/migrate/20211015024135_add_merge_commit_template_limit_to_project_settings.rb

+# frozen_string_literal: true
+
+class AddMergeCommitTemplateLimitToProjectSettings < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :project_settings, :merge_commit_template, 500
+  end
+
+  def down
+    remove_text_limit :project_settings, :merge_commit_template
+  end
+end

db/schema_migrations/20211015021114

+687fa7d06a8d74b561d2b392e706fb209dbb1c0c8a483ad066820d29f7df059b
\ No newline at end of file

db/schema_migrations/20211015024135

+d3cafd6eb712ba3f11aa0e2bddc15bf312230e52d53ba8b7ae6c8d3cfd4aabcc
\ No newline at end of file

db/structure.sql

@@ -18288,8 +18288,10 @@ CREATE TABLE project_settings (
     mr_default_target_self boolean DEFAULT false NOT NULL,
     previous_default_branch text,
     warn_about_potentially_unwanted_characters boolean DEFAULT true NOT NULL,
+    merge_commit_template text,
     CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
-    CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL))
+    CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)),
+    CONSTRAINT check_eaf7cfb6a7 CHECK ((char_length(merge_commit_template) <= 500))
 );
 
 CREATE TABLE project_statistics (

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -561,6 +561,7 @@ Project:
 - require_password_to_approve
 - autoclose_referenced_issues
 - suggestion_commit_message
+- merge_commit_template
 ProjectTracingSetting:
 - external_url
 Author: