Merge branch 'main' into follow-remote-ids

2020-12-12 09:34:54 -08:00
parent 7204068d2a a6171d6c60
commit 801b6c3a77
16 changed files with 130 additions and 35 deletions
--- a/bookwyrm/view_actions.py
+++ b/bookwyrm/view_actions.py
@ -42,7 +42,6 @@ def user_login(request):
    login_form.non_field_errors = 'Username or password are incorrect'
    register_form = forms.RegisterForm()
    data = {
-        'site_settings': models.SiteSettings.get(),
        'login_form': login_form,
        'register_form': register_form
    }
@ -78,7 +77,6 @@ def register(request):

    if errors:
        data = {
-            'site_settings': models.SiteSettings.get(),
            'login_form': forms.LoginForm(),
            'register_form': form
        }