diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/models/user_preference.rb | |
parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index b236250c24e..a36f56089a0 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -55,3 +55,5 @@ class UserPreference < ApplicationRecord "#{field_key}_notes_filter" end end + +UserPreference.prepend_if_ee('EE::UserPreference') |