diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/models/user_preference.rb | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/models/user_preference.rb')
| -rw-r--r-- | app/models/user_preference.rb | 2 |
1 files changed, 0 insertions, 2 deletions
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) } |