summaryrefslogtreecommitdiff
path: root/app/models/user_preference.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-23 12:09:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-23 12:09:58 +0000
commita071c2888d62f7a56349e99f5c070407df2e17c1 (patch)
tree47e5d2cb95920a1e28348c3af5a3d9987c2805c2 /app/models/user_preference.rb
parent8f2b51af416f4f4451632f6b3c2ada52c52eb44f (diff)
downloadgitlab-ce-a071c2888d62f7a56349e99f5c070407df2e17c1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user_preference.rb')
-rw-r--r--app/models/user_preference.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index d3b3a46bf74..c05bc80415a 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -8,6 +8,9 @@ class UserPreference < ApplicationRecord
belongs_to :user
+ scope :with_user, -> { joins(:user) }
+ scope :gitpod_enabled, -> { where(gitpod_enabled: true) }
+
validates :issue_notes_filter, :merge_request_notes_filter, inclusion: { in: NOTES_FILTERS.values }, presence: true
validates :tab_width, numericality: {
only_integer: true,