diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 12:06:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 12:06:20 +0000 |
| commit | 791785af5540d18eaa97da24f9ff8638e1960b72 (patch) | |
| tree | caeb6f08d9cc10a0052dc6851b46653d94c29022 /app/models/user.rb | |
| parent | a92d6b36c2d2892e8c070efb169f0c06815900ee (diff) | |
| download | gitlab-ce-791785af5540d18eaa97da24f9ff8638e1960b72.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index eec8ad6edbb..277d73cc2ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,9 +56,6 @@ 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] - MINIMUM_INACTIVE_DAYS = 180 # Override Devise::Models::Trackable#update_tracked_fields! |