Commit 4a09d7b3 authored by Imre Farkas's avatar Imre Farkas

Merge branch 'removed_state_ignoring_rule' into 'master'

Remove state column ignore rule

See merge request gitlab-org/gitlab!27690
parents 7a58dd17 d78021c8
...@@ -78,8 +78,6 @@ class Issue < ApplicationRecord ...@@ -78,8 +78,6 @@ class Issue < ApplicationRecord
scope :counts_by_state, -> { reorder(nil).group(:state_id).count } scope :counts_by_state, -> { reorder(nil).group(:state_id).count }
ignore_column :state, remove_with: '12.10', remove_after: '2020-03-22'
after_commit :expire_etag_cache, unless: :importing? after_commit :expire_etag_cache, unless: :importing?
after_save :ensure_metrics, unless: :importing? after_save :ensure_metrics, unless: :importing?
......
...@@ -261,8 +261,6 @@ class MergeRequest < ApplicationRecord ...@@ -261,8 +261,6 @@ class MergeRequest < ApplicationRecord
includes(:metrics) includes(:metrics)
end end
ignore_column :state, remove_with: '12.10', remove_after: '2020-03-22'
after_save :keep_around_commit, unless: :importing? after_save :keep_around_commit, unless: :importing?
alias_attribute :project, :target_project alias_attribute :project, :target_project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment