diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-12 06:16:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-12 06:16:05 +0300 |
| commit | fdc2b6184d20e767f089557f3cdc68837a6aacfb (patch) | |
| tree | 14b1005ac9138e65cdd716b2c7eb1084c970b1f1 /db/migrate | |
| parent | 101d32c3b8d57c73088f1103f87899b0b20531eb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20230222161954_add_text_limit_to_custom_jira_regex_fields.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20231123035033_add_generated_to_merge_request_context_commit_diff_files.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/db/migrate/20230222161954_add_text_limit_to_custom_jira_regex_fields.rb b/db/migrate/20230222161954_add_text_limit_to_custom_jira_regex_fields.rb index 625655fda9d..20991e4dffd 100644 --- a/db/migrate/20230222161954_add_text_limit_to_custom_jira_regex_fields.rb +++ b/db/migrate/20230222161954_add_text_limit_to_custom_jira_regex_fields.rb @@ -10,6 +10,6 @@ class AddTextLimitToCustomJiraRegexFields < Gitlab::Database::Migration[2.1] def down remove_text_limit :jira_tracker_data, :jira_issue_regex - remove_text_limit :jira_tracker_data, :jira_issue_regex + remove_text_limit :jira_tracker_data, :jira_issue_prefix end end diff --git a/db/migrate/20231123035033_add_generated_to_merge_request_context_commit_diff_files.rb b/db/migrate/20231123035033_add_generated_to_merge_request_context_commit_diff_files.rb new file mode 100644 index 00000000000..7e97a582116 --- /dev/null +++ b/db/migrate/20231123035033_add_generated_to_merge_request_context_commit_diff_files.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddGeneratedToMergeRequestContextCommitDiffFiles < Gitlab::Database::Migration[2.2] + milestone '16.7' + + enable_lock_retries! + + def change + add_column :merge_request_context_commit_diff_files, :generated, :boolean + end +end |