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/merge_request.rb | |
| parent | ae1c8db2c805a6d3fad3a66fa31bd414cc071490 (diff) | |
| download | gitlab-ce-70eb0cf7518e1ccc2a26d9aaa9fc16e21c6de5f1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 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 |