From d2ed415a25ca8fd00a75efbb43530e8b6af6a9cf Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 26 Oct 2017 10:42:18 +0200 Subject: [PATCH] Fixes per @okriuchykhin 's request --- .../users/registrations_controller.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index e42b63431..dbda51b4a 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -161,18 +161,16 @@ class Users::RegistrationsController < Devise::RegistrationsController else render :new end - else - if valid_resource - super do |resource| - # Set the confirmed_at == created_at IF not using email confirmations - unless Rails.configuration.x.enable_email_confirmations - resource.update(confirmed_at: resource.created_at) - resource.save - end + elsif valid_resource + super do |resource| + # Set the confirmed_at == created_at IF not using email confirmations + unless Rails.configuration.x.enable_email_confirmations + resource.update(confirmed_at: resource.created_at) + resource.save end - else - render :new end + else + render :new end end