diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb')
-rw-r--r-- | db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb b/db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb new file mode 100644 index 00000000000..adf2fdb2da7 --- /dev/null +++ b/db/migrate/20211015021114_add_merge_commit_template_to_project_settings.rb @@ -0,0 +1,9 @@ +# 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 |