FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-01-01 19:10:41 +01:00
parent d5b538461e f6e405c2e9
commit dc558902f4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/devise/mailer/confirmation_instructions.html.haml
View File

@ -5,4 +5,4 @@
= succeed '!' do = succeed '!' do
= @resource.screen_name = @resource.screen_name
%p You can confirm your account email through the link below: %p You can confirm your account email through the link below:
%p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))

2
app/views/devise/mailer/reset_password_instructions.html.haml
View File

@ -1,5 +1,5 @@
%p Hello #{@resource.screen_name}! %p Hello #{@resource.screen_name}!
%p Someone (hopefully you) has requested a link to change your password. You can do this through the link below. %p Someone (hopefully you) has requested a link to change your password. You can do this through the link below.
%p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
%p If you didn't request this, please ignore this email. %p If you didn't request this, please ignore this email.
%p Your password won't change until you access the link above and create a new one. %p Your password won't change until you access the link above and create a new one.

2
app/views/devise/mailer/unlock_instructions.html.haml
View File

@ -1,4 +1,4 @@
%p Hello #{@resource.screen_name}! %p Hello #{@resource.screen_name}!
%p Your account has been locked due to an excessive number of unsuccessful sign in attempts. %p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
%p Click the link below to unlock your account: %p Click the link below to unlock your account:
%p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))