diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-08-31 00:59:31 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-08-31 00:59:31 +0300 |
| commit | 88c6423e4a45103cc480467bc8f412a48e1e0b55 (patch) | |
| tree | c16f8134756de3acb3106fd9092ec0f73c8dc3b3 /app/models/user.rb | |
| parent | 1495a84cb7620f4d3d92b17146e760a523b1ede1 (diff) | |
| parent | d93b985df07ccf07541efef709edb8467e0f2955 (diff) | |
Merge branch 'remove-ignorable-column-concern' into 'master'
Remove dependency on IgnorableColumn concern
Closes #66746
See merge request gitlab-org/gitlab-ce!32427
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9952bc7e1ad..3ca84ba612a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,7 +13,6 @@ class User < ApplicationRecord include Sortable include CaseSensitivity include TokenAuthenticatable - include IgnorableColumn include FeatureGate include CreatedAtFilterable include BulkMemberAccessLoad @@ -24,9 +23,11 @@ class User < ApplicationRecord DEFAULT_NOTIFICATION_LEVEL = :participating - ignore_column :external_email - ignore_column :email_provider - ignore_column :authentication_token + self.ignored_columns += %i[ + authentication_token + email_provider + external_email + ] add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) } add_authentication_token_field :feed_token |