Merge commit 'cfb473c204
' into upstream-20250228
This commit is contained in:
commit
795561f5a7
78 changed files with 1684 additions and 1081 deletions
|
@ -11,7 +11,7 @@
|
|||
- if controller_name != 'passwords' && controller_name != 'registrations'
|
||||
%li= link_to t('auth.forgot_password'), new_user_password_path
|
||||
|
||||
- if controller_name != 'passwords' && controller_name != 'registrations' && params[:with_options].nil?
|
||||
- if controller_name != 'passwords' && controller_name != 'registrations' && params[:with_options].blank?
|
||||
%li= link_to t('auth.with_login_options'), new_user_session_path(with_options: '1')
|
||||
|
||||
- if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue