diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 09:06:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 09:06:11 +0300 |
| commit | 864475536355651a9f7caa5b1606aa5640424ec3 (patch) | |
| tree | 1dc80c96ddf3f9049c4a163b4c49f052a9b1a4ad /app/models/merge_request.rb | |
| parent | 7ddd5846999029916b2b6d8560b5b0f02ec0f6ea (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b0d030c78b7..a25d1ccccca 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -17,6 +17,7 @@ class MergeRequest < ApplicationRecord include FromUnion include DeprecatedAssignee include ShaAttribute + include IgnorableColumns sha_attribute :squash_commit_sha @@ -239,8 +240,7 @@ 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] + ignore_column :state, remove_with: '12.7', remove_after: '2019-12-22' after_save :keep_around_commit |