diff options
author | Brett Walker <brett@digitalmoksha.com> | 2017-12-05 09:01:46 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-05 09:01:46 +0000 |
commit | b0e2e21b7db5cc80f6a17b19354e91dd7fcf6c8c (patch) | |
tree | add3ed93627545152193d033d369335e56903f54 /app/views/devise/shared/_links.erb | |
parent | 61392168a0265e6c54cbccc6b7529822b123ff5b (diff) | |
download | gitlab-ce-b0e2e21b7db5cc80f6a17b19354e91dd7fcf6c8c.tar.gz |
remove ambiguity about which resource type to be using for new sessions
Diffstat (limited to 'app/views/devise/shared/_links.erb')
-rw-r--r-- | app/views/devise/shared/_links.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index 6e1cc244f26..cb934434c28 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -1,19 +1,19 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> + <%= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: "btn" %><br /> <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' && allow_signup? %> - <%= link_to "Sign up", new_registration_path(resource_name) %><br /> + <%= link_to "Sign up", new_registration_path(:user) %><br /> <% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> -<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" %><br /> +<%= link_to "Forgot your password?", new_password_path(:user), class: "btn" %><br /> <% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(:user) %><br /> <% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br /> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(:user) %><br /> <% end -%> |