Commit a76cd3a9 authored by Vitali Tatarintev's avatar Vitali Tatarintev

Clean up User.bot? method

Since the EE schema and migrations were backported
to CE, the check for the presence of the DB field
is redundant.

Backport commit:
https://gitlab.com/gitlab-org/gitlab
/commit/8469f59d
parent 3e5e23af
...@@ -627,10 +627,7 @@ class User < ApplicationRecord ...@@ -627,10 +627,7 @@ class User < ApplicationRecord
end end
def bot? def bot?
return bot_type.present? if has_attribute?(:bot_type) bot_type.present?
# Some older *migration* specs utilize this removed column
read_attribute(:support_bot)
end end
def internal? def internal?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment