Merge branch 'sh-fix-removed-support-bot-column' into 'master'

Ignore support_bot column in users table

Closes #67295

See merge request gitlab-org/gitlab-ce!32933
This commit is contained in:
Mayra Cabrera 2019-09-12 00:24:50 +00:00
commit 3c372d87a7
1 changed files with 3 additions and 0 deletions

View File

@ -56,6 +56,9 @@ class User < ApplicationRecord
BLOCKED_MESSAGE = "Your account has been blocked. Please contact your GitLab " \
"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]
# Override Devise::Models::Trackable#update_tracked_fields!
# to limit database writes to at most once every hour
# rubocop: disable CodeReuse/ServiceClass