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

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 8f02e35cf172fd82e40c58a9ab200f55e3680be9..1bb53215261d426294449a00e038733e2bab6900 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -242,8 +242,8 @@ class User < ApplicationRecord
   end
 
   ##
-  # delete a user - leave the account but purge most personal data
-  def delete
+  # destroy a user - leave the account but purge most personal data
+  def destroy
     avatar.purge_later
 
     self.display_name = "user_#{id}"