Commit 35e9c021 authored by Andreas Brandl's avatar Andreas Brandl

Merge branch 'ab/remove-support-bot-ignore' into 'master'

Remove ignoring users.support_bot column

See merge request gitlab-org/gitlab!16125
parents 650e2992 3c5e98b0
...@@ -56,9 +56,6 @@ class User < ApplicationRecord ...@@ -56,9 +56,6 @@ class User < ApplicationRecord
BLOCKED_MESSAGE = "Your account has been blocked. Please contact your GitLab " \ BLOCKED_MESSAGE = "Your account has been blocked. Please contact your GitLab " \
"administrator if you think this is an error." "administrator if you think this is an error."
# Removed in GitLab 12.3. Keep until after 2019-09-22.
self.ignored_columns += %i[support_bot]
MINIMUM_INACTIVE_DAYS = 180 MINIMUM_INACTIVE_DAYS = 180
# Override Devise::Models::Trackable#update_tracked_fields! # Override Devise::Models::Trackable#update_tracked_fields!
......
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