Merge pull request #223 from jtapia/chore/solidus-v.3.1.0-fix

Move to Spree::SoftDeletable on users model

Author: tvdeyen

app/models/spree/user.rb

@@ -3,22 +3,12 @@
 module Spree
   class User < Spree::Base
     include UserMethods
+    include Spree::SoftDeletable
 
     devise :database_authenticatable, :registerable, :recoverable,
       :rememberable, :trackable, :validatable, :encryptable
     devise :confirmable if Spree::Auth::Config[:confirmable]
 
-    if defined?(Spree::SoftDeletable)
-      include Spree::SoftDeletable
-    else
-      acts_as_paranoid
-      include Spree::ParanoiaDeprecations
-
-      include Discard::Model
-
-      self.discard_column = :deleted_at
-    end
-
     after_destroy :scramble_email_and_password
     after_discard :scramble_email_and_password