Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the devise helper signed_in_root_path call #304

Open
wants to merge 2 commits into
base: 2-4-stable
Choose a base branch
from
Open

Fix the devise helper signed_in_root_path call #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f442d41
Fix the devise helper signed_in_root_path call
rsierra Jun 30, 2015
85ad7e0
Removed html link from text/plain email template
arbesulo Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/controllers/frontend/spree/user_confirmations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
protected

def after_confirmation_path_for(resource_name, resource)
signed_in?(resource_name) ? spree.signed_in_root_path(resource) : spree.login_path
signed_in?(resource_name) ? signed_in_root_path(resource) : spree.login_path
end
end
4 changes: 2 additions & 2 deletions lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Welcome <%= @email %>!

You can confirm your account email through the link below:
You can confirm your account email through the url below:

<%= link_to 'Confirm my account', @confirmation_url %>
<%= @confirmation_url %>