Skip to content
Snippets Groups Projects
Commit 4ce7205f authored by Mayra Cabrera's avatar Mayra Cabrera Committed by 🤖 GitLab Bot 🤖
Browse files

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

(cherry picked from commit 3c372d87)

c816e768 Ignore support_bot column in users table
parent c1093fb2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -55,6 +55,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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment