kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'pl-user-bot_type-ce' into 'master' 

CE Backport: Refactor Service Desk's bot user

See merge request gitlab-org/gitlab-ce!26671
This commit is contained in:
Sean McGivern 2019-04-12 12:16:07 +00:00
parent 7457c1e122 a69f889101
commit f9cf04fe4f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/user.rb
View File

@ -537,20 +537,16 @@ class User < ApplicationRecord
username username
end end
def self.internal_attributes
[:ghost]
end
def internal? def internal?
self.class.internal_attributes.any? { |a| self[a] } ghost?
end end
def self.internal def self.internal
where(Hash[internal_attributes.zip([true] * internal_attributes.size)]) where(ghost: true)
end end
def self.non_internal def self.non_internal
where(internal_attributes.map { |attr| "#{attr} IS NOT TRUE" }.join(" AND ")) where('ghost IS NOT TRUE')
end end
# #