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

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 8f02e35cf172fd82e40c58a9ab200f55e3680be9..8c75b4ef45e7ad4fd608a4fd59c2ecb7a332b538 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,7 +45,6 @@
 
 class User < ApplicationRecord
   require "digest"
-  require "xml/libxml"
 
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
@@ -242,8 +241,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}"