diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 847249b22f8bc69dce4043a6d3815b213abd676c..8c84d898ea63676cff60a4fc8e07fba392e19d45 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class UserPreference < MainClusterwide::ApplicationRecord - include IgnorableColumns - # We could use enums, but Rails 4 doesn't support multiple # enum options with same name for multiple fields, also it creates # extra methods that aren't really needed here. @@ -35,9 +33,6 @@ class UserPreference < MainClusterwide::ApplicationRecord validate :user_belongs_to_home_organization, if: :home_organization_changed? - # 2023-06-22 is after 16.1 release and during 16.2 release https://docs.gitlab.com/ee/development/database/avoiding_downtime_in_migrations.html#ignoring-the-column-release-m - ignore_columns :use_legacy_web_ide, remove_with: '16.2', remove_after: '2023-06-22' - attribute :tab_width, default: -> { Gitlab::TabWidth::DEFAULT } attribute :time_display_relative, default: true attribute :time_display_format, default: 0