bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Email testing support, added Gemfile.lock and compiled bumbleberry assets to gitignore.

Browse Source
This commit is contained in:
Godwin
2015-09-07 12:25:17 -07:00
parent 34d50cff5a
commit 83986fe51c
542 changed files with 13070 additions and 3738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/application_controller.rb
+7 -2
View File
@@ -103,8 +103,13 @@ class ApplicationController < LinguaFrancaApplicationController
end
expiry ||= (Time.now + 12.hours)
session[:confirm_uid] = user.id
confirmation = EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
UserMailer.email_confirmation(confirmation).deliver_now
#confirmation = EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
#UserMailer.email_confirmation(confirmation).deliver_now
UserMailer.send_mail :email_confirmation do
{
:args => EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
}
end
end
def do_confirm(settings = nil)