From 8f46f259828572697a624d4f54cb912f68fbaf9b Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sat, 28 Apr 2018 00:13:21 +0300 Subject: [PATCH] Fix wrong resolves of conflict --- .../devise_token_auth/registrations_controller.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/controllers/devise_token_auth/registrations_controller.rb b/app/controllers/devise_token_auth/registrations_controller.rb index 54e060706..da59a2701 100644 --- a/app/controllers/devise_token_auth/registrations_controller.rb +++ b/app/controllers/devise_token_auth/registrations_controller.rb @@ -50,12 +50,6 @@ def create @client_id, @token = @resource.create_token @resource.save! update_auth_header - else - # user will require email authentication - @resource.send_confirmation_instructions( - client_config: params[:config_name], - redirect_url: @redirect_url - ) end render_create_success else