tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admission-based registrations mode (#10250)

Browse Source 
Fix #6856
Fix #6951
This commit is contained in:
Eugen Rochko
2019-03-14 05:28:30 +01:00
committed by GitHub
parent 6e3936aa6f
commit 51e154f5e8
92 changed files with 282 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/auth/registrations/new.html.haml
View File

@ -29,6 +29,6 @@
%p.hint= t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path)
.actions
= f.button :button, t('auth.register'), type: :submit
= f.button :button, sign_up_message, type: :submit
.form-footer= render 'auth/shared/links'

2
app/views/auth/shared/_links.html.haml
View File

@ -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'), open_registrations? ? new_registration_path(resource_name) : 'https://joinmastodon.org/#getting-started'
%li= link_to t('auth.register'), available_sign_up_path
- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
%li= link_to t('auth.forgot_password'), new_password_path(resource_name)