diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-26 12:13:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-26 12:13:05 +0300 |
commit | abc0c2c7700bc4dfb6adc23a9594b2b7be6bd051 (patch) | |
tree | fdfccb98a77c12fb8b5628069db96e47a3ff5fc9 /app/models/user_preference.rb | |
parent | f803bba164be7079e79137bfe5a15ca5748aee94 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user_preference.rb')
-rw-r--r-- | app/models/user_preference.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 4d517408154..e527542e357 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -2,15 +2,12 @@ class UserPreference < ApplicationRecord include IgnorableColumns - include SafelyChangeColumnDefault # 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. NOTES_FILTERS = { all_notes: 0, only_comments: 1, only_activity: 2 }.freeze - columns_changing_default :tab_width, :time_display_relative, :render_whitespace_in_code - belongs_to :user scope :with_user, -> { joins(:user) } |