diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
| commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/views/auth/shared | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) | |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/auth/shared')
| -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 08b385092..516c625a6 100644 --- a/app/views/auth/shared/_links.html.haml +++ b/app/views/auth/shared/_links.html.haml @@ -3,7 +3,7 @@ %li= link_to t('auth.login'), new_session_path(resource_name) - if devise_mapping.registerable? && controller_name != 'registrations' - %li= link_to t('auth.register'), new_registration_path(resource_name) + %li= link_to t('auth.register'), open_registrations? ? new_registration_path(resource_name) : 'https://joinmastodon.org/#getting-started' - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %li= link_to t('auth.forgot_password'), new_password_path(resource_name) |