From 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 24 Mar 2020 12:09:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/merge_request.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/models/merge_request.rb')

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
-- 
cgit v1.2.3