diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:00 +0000 |
| commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
| tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /app/models/merge_request.rb | |
| parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) | |
| download | gitlab-ce-b570d73ecd31e2ca9cf8c2f1adb056edf2869477.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, 3 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a8c15ef2028..399fc030d24 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -228,6 +228,9 @@ class MergeRequest < ApplicationRecord with_state(:opened).where(auto_merge_enabled: true) end + # Only remove after 2019-12-22 and with %12.7 + self.ignored_columns += %i[state] + after_save :keep_around_commit alias_attribute :project, :target_project |