diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-30 23:29:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 23:29:55 +0200 |
| commit | 65db9df011a3e13efa79f4e56343aa69bdad7716 (patch) | |
| tree | 1941b85de1f0d1b6f56b73345cddf664a71faf20 /app/views/auth/shared/_links.html.haml | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
| parent | 3b855b5c82362783969f748ad78bcaf85f938c9f (diff) | |
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/auth/shared/_links.html.haml')
| -rw-r--r-- | app/views/auth/shared/_links.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml index e6c3f7cca..66ed5b93f 100644 --- a/app/views/auth/shared/_links.html.haml +++ b/app/views/auth/shared/_links.html.haml @@ -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 != 'confirmations' + - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?) %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path - if user_signed_in? && controller_name != 'setup' |