summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-29 16:10:49 -0700
committerStan Hu <stanhu@gmail.com>2019-08-30 13:15:34 -0700
commitd93b985df07ccf07541efef709edb8467e0f2955 (patch)
tree6951f100961a2c6b56dfe593daaaaa5a6675f5a4 /app/models/user.rb
parentfa6f19d1f83b68f2bb729be889ab7d66adbbedb8 (diff)
downloadgitlab-ce-d93b985df07ccf07541efef709edb8467e0f2955.tar.gz
Use self.ignored_columns += instead of =
This is to accomodate prepended modules.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 79c89461806..cb222b87d88 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,11 +23,11 @@ class User < ApplicationRecord
DEFAULT_NOTIFICATION_LEVEL = :participating
- self.ignored_columns = %i[
- authentication_token
- email_provider
- external_email
- ]
+ 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