From 3bdecbe7fc67bf76142fc91e01130842654c322f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 20 Jun 2016 11:46:41 +0200 Subject: [PATCH] [bug] prevent linking field User.merged_at from SSO --- app/views/api/auth_providers/mapping_fields.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/api/auth_providers/mapping_fields.json.jbuilder b/app/views/api/auth_providers/mapping_fields.json.jbuilder index 0ba57b6d4..7416aa3cc 100644 --- a/app/views/api/auth_providers/mapping_fields.json.jbuilder +++ b/app/views/api/auth_providers/mapping_fields.json.jbuilder @@ -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) \ No newline at end of file