[#939] Rebase and resolve conflicts

requirements/base.in

@@ -37,12 +37,7 @@ django-view-breadcrumbs
 markdown
 django_better_admin_arrayfield
 humanfriendly
-<<<<<<< HEAD
 git+https://github.com/maykinmedia/[email protected]#egg=mail-editor
-=======
-# mail-editor
-git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1#egg=mail-editor
->>>>>>> 83677aa4 ([#939] Update mail-editor)
 fontawesomefree
 django-timeline-logger
 django-csp

requirements/base.txt

@@ -357,11 +357,7 @@ lxml==4.9.1
     #   maykin-python3-saml
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via -r requirements/base.in
 mail-parser==3.15.0
     # via django-yubin

requirements/ci.txt

@@ -626,11 +626,7 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt

requirements/dev.txt

@@ -717,11 +717,7 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt

src/open_inwoner/configurations/migrations/0063_merge_20240216_1622.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.10 on 2024-02-16 15:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("configurations", "0062_merge_20240214_1644"),
+        ("configurations", "0062_merge_20240215_1501"),
+    ]
+
+    operations = []

src/open_inwoner/haalcentraal/tests/test_signal.py

@@ -1,16 +1,10 @@
-import logging
-from unittest.mock import patch
-
 from django.test import TestCase, override_settings
-from django.utils.translation import gettext as _
 
 import requests_mock
 from freezegun import freeze_time
-from timeline_logger.models import TimelineLog
 
 from open_inwoner.accounts.choices import LoginTypeChoices
 from open_inwoner.accounts.tests.factories import UserFactory
-from open_inwoner.utils.logentry import LOG_ACTIONS
 
 from ...utils.test import ClearCachesMixin
 from ..models import HaalCentraalConfig

src/open_inwoner/pdc/models/product.py

@@ -5,7 +5,6 @@
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.urls import reverse
-from django.utils.html import strip_tags
 from django.utils.translation import gettext_lazy as _
 
 from filer.fields.file import FilerFileField