Merge remote-tracking branch 'upstream/pull/4472'

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 5790d81e51d1be60d561eaa934aa863e2aad913b..bc95f20c1568fe70cdd436c3ce96d1b8fd48ad42 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -119,7 +119,6 @@ class User < ApplicationRecord
 
   alias_attribute :created_at, :creation_time
 
 
   alias_attribute :created_at, :creation_time
 

-  after_initialize :encrypt_password

   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check