Skip to content

Commit

Permalink
@esource.invitation_token is changed to @token as Devise 3.1 changed …
Browse files Browse the repository at this point in the history
…how token is persisted. Ref: scambra/devise_invitable#410
  • Loading branch information
qmaruf committed Dec 25, 2015
1 parent 189564f commit f5f9763
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions app/views/devise/mailer/confirmation_instructions.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%>
<p>Hello <%= @resource.email %>!</p>

<p>You now have a preview account at <%= root_url %>. Click to <%= link_to 'verify', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %> your account.</p>
<p>You now have a preview account at <%= root_url %>. Click to <%= link_to 'verify', accept_invitation_url(@resource, :invitation_token => @token) %> your account.</p>

<p>We recommend you watch this <a href="https://vimeo.com/83073455">overview video</a> and if you are technically minded, this <a href="https://vimeo.com/83258935">technical video</a>.</p>

Expand All @@ -15,7 +15,7 @@ We are opening this server for accounts so users can influence the development o
<strong>How to Use:</strong>
</p>
<ol>
<li>Make sure you <%= link_to 'verify your account', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></li>
<li>Make sure you <%= link_to 'verify your account', accept_invitation_url(@resource, :invitation_token => @token) %></li>
<li>Download the extension for your browser. Either <a href="https://chrome.google.com/webstore/detail/privly/pkokikcdapfpkkkjpdaamjanniaempol">Chrome</a> or <a href="https://addons.mozilla.org/en-US/firefox/addon/privly/">Firefox</a>.</li>
<li>Restart your browser</li>
<li>Right-click on any text area and select "New Message"</li>
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/mailer/confirmation_instructions.text.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%>
Hello <%= @resource.email %>!

You now have a preview account at <%= root_url %>. Click to verify <%= accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %> your account.
You now have a preview account at <%= root_url %>. Click to verify <%= accept_invitation_url(@resource, :invitation_token => @token) %> your account.

We recommend you watch the overview video (https://vimeo.com/83073455) and if you are technically minded, technical video (https://vimeo.com/83258935).

Expand All @@ -12,7 +12,7 @@ Warning: Privly is currently "in alpha". You should not trust your life, liberty
We are opening this server for accounts so users can influence the development of the system. People who are not active members of the community may lose the ability to post new content if demands on our servers outpace our resources. If you find a problem, please report it so we can fix it for everyone.

How to Use:
1. make sure you verify your account here <%= accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %>
1. make sure you verify your account here <%= accept_invitation_url(@resource, :invitation_token => @token) %>
2. Download the extension for your browser. Either Chrome (https://chrome.google.com/webstore/detail/privly/pkokikcdapfpkkkjpdaamjanniaempol) or Firefox (https://addons.mozilla.org/en-US/firefox/addon/privly/)
3. Restart your browser
4. Right-click on any text area and select "New Message"
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/mailer/invitation_instructions.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%>
<p>Hello <%= @resource.email %>!</p>

<p>You now have a preview account at <%= root_url %>. Click to <%= link_to 'verify', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %> your account.</p>
<p>You now have a preview account at <%= root_url %>. Click to <%= link_to 'verify', accept_invitation_url(@resource, :invitation_token => @token) %> your account.</p>

<p>We recommend you watch this <a href="https://vimeo.com/83073455">overview video</a> and if you are technically minded, this <a href="https://vimeo.com/83258935">technical video</a>.</p>

Expand All @@ -15,7 +15,7 @@ We are opening this server for accounts so users can influence the development o
<strong>How to Use:</strong>
</p>
<ol>
<li>Make sure you <%= link_to 'verify your account', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></li>
<li>Make sure you <%= link_to 'verify your account', accept_invitation_url(@resource, :invitation_token => @token) %></li>
<li>Download the extension for your browser. Either <a href="https://chrome.google.com/webstore/detail/privly/pkokikcdapfpkkkjpdaamjanniaempol">Chrome</a> or <a href="https://addons.mozilla.org/en-US/firefox/addon/privly/">Firefox</a>.</li>
<li>Restart your browser</li>
<li>Right-click on any text area and select "New Message"</li>
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/mailer/invitation_instructions.text.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%>
Hello <%= @resource.email %>!

You now have a preview account at <%= root_url %>. Click to verify <%= accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %> your account.
You now have a preview account at <%= root_url %>. Click to verify <%= accept_invitation_url(@resource, :invitation_token => @token) %> your account.

We recommend you watch the overview video (https://vimeo.com/83073455) and if you are technically minded, technical video (https://vimeo.com/83258935).

Expand All @@ -12,7 +12,7 @@ Warning: Privly is currently "in alpha". You should not trust your life, liberty
We are opening this server for accounts so users can influence the development of the system. People who are not active members of the community may lose the ability to post new content if demands on our servers outpace our resources. If you find a problem, please report it so we can fix it for everyone.

How to Use:
1. make sure you verify your account here <%= accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %>
1. make sure you verify your account here <%= accept_invitation_url(@resource, :invitation_token => @token) %>
2. Download the extension for your browser. Either Chrome (https://chrome.google.com/webstore/detail/privly/pkokikcdapfpkkkjpdaamjanniaempol) or Firefox (https://addons.mozilla.org/en-US/firefox/addon/privly/)
3. Restart your browser
4. Right-click on any text area and select "New Message"
Expand Down

0 comments on commit f5f9763

Please sign in to comment.