diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-10-12 11:01:53 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-11-02 11:39:02 +0100 |
| commit | 668183d479ec09bce156c937be1ee400c52c2c2f (patch) | |
| tree | 168074b3d3e68b004d880f3d5e0b35bba21867d1 /app/models/user.rb | |
| parent | 294fa6fcdcfa7d76bc97b754d2930f3686f54997 (diff) | |
| download | gitlab-ce-668183d479ec09bce156c937be1ee400c52c2c2f.tar.gz | |
Remove User#private_token
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9459b6d4fa4..cfa94dd1b03 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,7 +22,6 @@ class User < ActiveRecord::Base ignore_column :external_email ignore_column :email_provider - add_authentication_token_field :authentication_token add_authentication_token_field :incoming_email_token add_authentication_token_field :rss_token @@ -163,7 +162,7 @@ class User < ActiveRecord::Base before_validation :sanitize_attrs before_validation :set_notification_email, if: :email_changed? before_validation :set_public_email, if: :public_email_changed? - before_save :ensure_authentication_token, :ensure_incoming_email_token + before_save :ensure_incoming_email_token before_save :ensure_user_rights_and_limits, if: :external_changed? before_save :skip_reconfirmation!, if: ->(user) { user.email_changed? && user.read_only_attribute?(:email) } before_save :check_for_verified_email, if: ->(user) { user.email_changed? && !user.new_record? } @@ -185,8 +184,6 @@ class User < ActiveRecord::Base # Note: When adding an option, it MUST go on the end of the array. enum project_view: [:readme, :activity, :files] - alias_attribute :private_token, :authentication_token - delegate :path, to: :namespace, allow_nil: true, prefix: true state_machine :state, initial: :active do |