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:
commit
3c372d87a7
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue