diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-09-12 00:24:50 +0000 |
|---|---|---|
| committer | 🤖 GitLab Bot 🤖 <gitlab-bot@gitlab.com> | 2019-09-12 01:19:50 +0000 |
| commit | 4ce7205f7b42a26a571d8efa9720553061a7dde0 (patch) | |
| tree | 3fe4a38f514a9c9382ad7b1d0e7330b68e3c0dd0 | |
| parent | c1093fb2b383ea04fa2872c894296d997a87a483 (diff) | |
| download | gitlab-ce-4ce7205f7b42a26a571d8efa9720553061a7dde0.tar.gz | |
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 3c372d87a701b600f42fccbf4707eebd67ff7cac)
c816e768 Ignore support_bot column in users table
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9ca01715578..299fe02a6d5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 |