From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 20 Jan 2021 13:34:23 -0600
Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee

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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index b49a7eb72dc..49b93ffaf66 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -8,8 +8,6 @@ class UserPreference < ApplicationRecord
   # extra methods that aren't really needed here.
   NOTES_FILTERS = { all_notes: 0, only_comments: 1, only_activity: 2 }.freeze
 
-  ignore_column :feature_filter_type, remove_with: '13.8', remove_after: '2021-01-22'
-
   belongs_to :user
 
   scope :with_user, -> { joins(:user) }
-- 
cgit v1.2.3