From adff3c425153262811bd8930d0c2a2d842edaed9 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Jan 2024 13:45:35 +1100 Subject: [PATCH] allow user exports with s3 also undoes a line space change in settings.py to make the PR cleaner --- bookwyrm/settings.py | 1 + bookwyrm/templates/settings/imports/imports.html | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 3f9665baf..cc941da84 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -442,4 +442,5 @@ if HTTP_X_FORWARDED_PROTO: # Do not change this setting unless you already have an existing # user with the same username - in which case you should change it! INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" + DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_SIZE", (1024**2 * 100)) diff --git a/bookwyrm/templates/settings/imports/imports.html b/bookwyrm/templates/settings/imports/imports.html index 11b3c7e03..ca53dd410 100644 --- a/bookwyrm/templates/settings/imports/imports.html +++ b/bookwyrm/templates/settings/imports/imports.html @@ -157,13 +157,10 @@ >

{% trans "Users are currently unable to start new user exports. This is the default setting." %}

- {% if use_s3 %} -

{% trans "It is not currently possible to provide user exports when using s3 storage. The BookWyrm development team are working on a fix for this." %}

- {% endif %}
{% csrf_token %}
-