diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-09-12 03:24:50 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-09-12 03:24:50 +0300 |
| commit | 3c372d87a701b600f42fccbf4707eebd67ff7cac (patch) | |
| tree | 125d61b97059887caf6d7ebdb5c6943d6bdcd827 /app | |
| parent | b966e9e027f467cf3d8228f55d120347f1dd0079 (diff) | |
| parent | c816e76820c9a90bb9b13520db35f02b495257a0 (diff) | |
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
Diffstat (limited to 'app')
| -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 d03dd064a94..48acdfeb2ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 |