scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 11:57:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixes per @okriuchykhin 's request

Browse source
This commit is contained in:
zmagod 2017-10-26 10:42:18 +02:00
parent 5e6a4bb69a
commit d2ed415a25
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/users/registrations_controller.rb
View file

@ -161,18 +161,16 @@ class Users::RegistrationsController < Devise::RegistrationsController
else else
render :new render :new
end end
else elsif valid_resource
if valid_resource super do |resource|
super do |resource| # Set the confirmed_at == created_at IF not using email confirmations
# Set the confirmed_at == created_at IF not using email confirmations unless Rails.configuration.x.enable_email_confirmations
unless Rails.configuration.x.enable_email_confirmations resource.update(confirmed_at: resource.created_at)
resource.update(confirmed_at: resource.created_at) resource.save
resource.save
end
end end
else
render :new
end end
else
render :new
end end
end end