summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-09-11 11:26:17 -0700
committerStan Hu <stanhu@gmail.com>2019-09-11 11:28:25 -0700
commitc816e76820c9a90bb9b13520db35f02b495257a0 (patch)
tree48b541c2a366e24351efb96612529d5ce8f6c1e0 /app
parent6db9cbfe77a556ea2d321f0ea0a0c6b6e14a817c (diff)
downloadgitlab-ce-c816e76820c9a90bb9b13520db35f02b495257a0.tar.gz
Ignore support_bot column in users tablesh-fix-removed-support-bot-column
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32554 removed the support_bot column, but nodes were not told to ignore this column. As a result, after the post-deploy migration ran, nodes attempted to use this column, causing 500 errors. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67295
Diffstat (limited to 'app')
-rw-r--r--app/models/user.rb3
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