htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into add_roles_via_LTI

Browse Source 
# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim
This commit is contained in:
Sebastian Serth
2018-12-14 00:53:06 +01:00
parent 3665058435 6c46566174
commit 1a26d67c82
47 changed files with 256 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/mailers/user_mailer.rb
View File

@ -1,4 +1,10 @@
class UserMailer < ActionMailer::Base
def mail(*args)
# used to prevent the delivery to pseudonymous users without a valid email address
super unless args.first[:to].blank?
end
def activation_needed_email(user)
@activation_url = activate_internal_user_url(user, token: user.activation_token)
mail(subject: t('mailers.user_mailer.activation_needed.subject'), to: user.email)