diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/views/auth | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/views/auth')
-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) |