Merge remote-tracking branch 'paperless/dev' into feature-consume-eml

diff --cc Pipfile
Simple merge

diff --cc docker/compose/docker-compose.postgres-tika.yml
index cb6555e29184a22c860d7dc6d677d8085514d4a9,df2023e91c6272641f243fc858cda835f74a0cf4..ca47ebfdcda87f7bc47a47bc75d3aa183a8fad40
--- 1/docker/compose/docker-compose.postgres-tika.yml
--- 2/docker/compose/docker-compose.postgres-tika.yml
+++ b/docker/compose/docker-compose.postgres-tika.yml
@@@ -77,8 -77,11 +77,8 @@@ services
        PAPERLESS_TIKA_ENDPOINT: http://tika:9998
  
    gotenberg:
-     image: gotenberg/gotenberg:7.4
+     image: docker.io/gotenberg/gotenberg:7.4
      restart: unless-stopped
 -    command:
 -      - "gotenberg"
 -      - "--chromium-disable-routes=true"
  
    tika:
      image: ghcr.io/paperless-ngx/tika:latest

diff --cc docker/compose/docker-compose.sqlite-tika.yml
index f16d34dd2387803215398502ec6538c104bead3a,35f3a358a2c15f52b6fadabec33f1fa8d0bdb052..9b6eeae1c6cddbaf94b982704827571aaad2d42e
--- 1/docker/compose/docker-compose.sqlite-tika.yml
--- 2/docker/compose/docker-compose.sqlite-tika.yml
+++ b/docker/compose/docker-compose.sqlite-tika.yml
@@@ -65,8 -65,11 +65,8 @@@ services
        PAPERLESS_TIKA_ENDPOINT: http://tika:9998
  
    gotenberg:
-     image: gotenberg/gotenberg:7.4
+     image: docker.io/gotenberg/gotenberg:7.4
      restart: unless-stopped
 -    command:
 -      - "gotenberg"
 -      - "--chromium-disable-routes=true"
  
    tika:
      image: ghcr.io/paperless-ngx/tika:latest

diff --cc docs/configuration.rst
Simple merge

diff --cc src/paperless_mail/mail.py
Simple merge

diff --cc src/paperless_mail/migrations/0016_mailrule_consumption_scope.py
index e9e7990147849ee437058b32088accd2e542e240,0000000000000000000000000000000000000000..ea54bce1b375a921eb4cff3f851f2686acdaf828
mode 100644,000000..100644
--- 1/src/paperless_mail/migrations/0015_mailrule_consumption_scope.py
--- /dev/null
+++ b/src/paperless_mail/migrations/0016_mailrule_consumption_scope.py
@@@ -1,32 -1,0 +1,32 @@@
- # Generated by Django 4.0.4 on 2022-05-03 15:58
++# Generated by Django 4.0.4 on 2022-07-11 22:02
 +
 +from django.db import migrations, models
 +
 +
 +class Migration(migrations.Migration):
 +
 +    dependencies = [
-         ("paperless_mail", "0014_alter_mailrule_action"),
++        ("paperless_mail", "0015_alter_mailrule_action"),
 +    ]
 +
 +    operations = [
 +        migrations.AddField(
 +            model_name="mailrule",
 +            name="consumption_scope",
 +            field=models.PositiveIntegerField(
 +                choices=[
 +                    (1, "Only process attachments."),
 +                    (
 +                        2,
 +                        "Process full Mail (with embedded attachments in file) as .eml",
 +                    ),
 +                    (
 +                        3,
 +                        "Process full Mail (with embedded attachments in file) as .eml + process attachments as separate documents",
 +                    ),
 +                ],
 +                default=1,
 +                verbose_name="consumption scope",
 +            ),
 +        ),
 +    ]

diff --cc src/paperless_mail/models.py
Simple merge