Automatic merge of gitlab-org/gitlab-ce master

b497b40a · GitLab Bot · cd82f261 · 3c372d87 · b497b40a
Commit b497b40a authored Sep 12, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app/models/user.rb app/models/user.rb +3 -0

No files found.
--- 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