diff options
| author | Yorick Peterse <yorick@yorickpeterse.com> | 2019-10-30 17:22:45 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorick@yorickpeterse.com> | 2019-10-30 17:22:45 +0300 |
| commit | ad8eea383406037a207c80421e6e4bfa357f8044 (patch) | |
| tree | 396b89ad72b9d7e35fab26c6ee22c978a12defbb /app/models/merge_request.rb | |
| parent | 228d752ff09362002cc904d28edee7d63cc3cef2 (diff) | |
| parent | b0f939a79fe16ff760d6e589c8f9cd71c0fa1da7 (diff) | |
Merge dev.gitlab.org@master into GitLab.com@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 250bac95b82..9dc4bd940d9 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -69,6 +69,14 @@ class MergeRequest < ApplicationRecord has_many :merge_request_assignees has_many :assignees, class_name: "User", through: :merge_request_assignees + KNOWN_MERGE_PARAMS = [ + :auto_merge_strategy, + :should_remove_source_branch, + :force_remove_source_branch, + :commit_message, + :squash_commit_message, + :sha + ].freeze serialize :merge_params, Hash # rubocop:disable Cop/ActiveRecordSerialize after_create :ensure_merge_request_diff |