diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 12:12:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 12:12:15 +0000 |
| commit | 70eb0cf7518e1ccc2a26d9aaa9fc16e21c6de5f1 (patch) | |
| tree | 01b2cad5224d5f9664b840ff75610db60b9ff095 /app/models | |
| parent | ae1c8db2c805a6d3fad3a66fa31bd414cc071490 (diff) | |
| download | gitlab-ce-70eb0cf7518e1ccc2a26d9aaa9fc16e21c6de5f1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 3 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 32536b38895..b2dd2264046 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -123,7 +123,8 @@ class MergeRequest < ApplicationRecord :force_remove_source_branch, :commit_message, :squash_commit_message, - :sha + :sha, + :skip_ci ].freeze serialize :merge_params, Hash # rubocop:disable Cop/ActiveRecordSerialize diff --git a/app/models/project.rb b/app/models/project.rb index d18ef68fd80..6c99f929237 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -53,6 +53,7 @@ class Project < ApplicationRecord ignore_columns :mirror_last_update_at, :mirror_last_successful_update_at, remove_after: '2021-09-22', remove_with: '14.4' ignore_columns :pull_mirror_branch_prefix, remove_after: '2021-09-22', remove_with: '14.4' + ignore_columns :build_coverage_regex, remove_after: '2022-10-22', remove_with: '15.5' STATISTICS_ATTRIBUTE = 'repositories_count' UNKNOWN_IMPORT_URL = 'http://unknown.git' |