mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-03-21 12:29:03 +01:00
[bug] prevent linking field User.merged_at from SSO
This commit is contained in:
parent
0466dd9ffc
commit
3bdecbe7fc
@ -4,6 +4,6 @@
|
||||
json.user User.column_names - %w(id encrypted_password reset_password_token reset_password_sent_at remember_created_at
|
||||
sign_in_count current_sign_in_at last_sign_in_at current_sign_in_ip last_sign_in_ip confirmation_token confirmed_at
|
||||
confirmation_sent_at unconfirmed_email failed_attempts unlock_token locked_at created_at updated_at stp_customer_id slug
|
||||
provider auth_token)
|
||||
provider auth_token merged_at)
|
||||
|
||||
json.profile Profile.column_names - %w(id user_id created_at updated_at) + %w(avatar)
|
Loading…
x
Reference in New Issue
Block a user