diff options
author | Alexis Reigel <mail@koffeinfrei.org> | 2017-05-23 14:09:19 +0200 |
---|---|---|
committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-05-24 22:29:59 +0200 |
commit | 3713a57fe8c40bfccaa668d081caccb92354b1da (patch) | |
tree | bbd705a9ab40daefd95f7f143ca672ed4bd74561 /app | |
parent | c013d23d6320487cf293891f7c6b213cab816980 (diff) | |
download | gitlab-ce-3713a57fe8c40bfccaa668d081caccb92354b1da.tar.gz |
add rss_token attribute to user model
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 837ab78228b..a356419a796 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,6 +15,7 @@ class User < ActiveRecord::Base add_authentication_token_field :authentication_token add_authentication_token_field :incoming_email_token + add_authentication_token_field :rss_token default_value_for :admin, false default_value_for(:external) { current_application_settings.user_default_external } @@ -152,7 +153,7 @@ class User < ActiveRecord::Base before_validation :set_public_email, if: ->(user) { user.public_email_changed? } after_update :update_emails_with_primary_email, if: ->(user) { user.email_changed? } - before_save :ensure_authentication_token, :ensure_incoming_email_token + before_save :ensure_authentication_token, :ensure_incoming_email_token, :ensure_rss_token before_save :ensure_external_user_rights after_save :ensure_namespace_correct after_initialize :set_projects_limit |