Skip to content

Move to Spree::SoftDeletable on users model #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tvdeyen merged 2 commits into from
Jan 3, 2026
Merged

Move to Spree::SoftDeletable on users model #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
512fc62
Fix autoload issue on Solidus v3.1.0
Jul 26, 2022
cd13355
Merge branch 'main' into chore/solidus-v.3.1.0-fix
tvdeyen Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions app/models/spree/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down