diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 15:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 15:09:42 +0300 |
| commit | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (patch) | |
| tree | f326420fc64999c6bcc28816ed54f0972fb46459 /app/models/merge_request.rb | |
| parent | 6f7881ee9dcec34141a8f34fc814b56b366d2b48 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bb7afc49cd8..7934b0f8f59 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -261,8 +261,6 @@ class MergeRequest < ApplicationRecord includes(:metrics) end - ignore_column :state, remove_with: '12.10', remove_after: '2020-03-22' - after_save :keep_around_commit, unless: :importing? alias_attribute :project, :target_project |