Merge branch 'main' into pylint-update

2021-09-18 07:46:12 -07:00
parent 377a4e1ef1 d366257909
commit be86fbcf4d
21 changed files with 268 additions and 24 deletions
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@ -156,6 +156,16 @@ urlpatterns = [
        views.EmailBlocklist.as_view(),
        name="settings-email-blocks-delete",
    ),
+    re_path(
+        r"^settings/ip-blocklist/?$",
+        views.IPBlocklist.as_view(),
+        name="settings-ip-blocks",
+    ),
+    re_path(
+        r"^settings/ip-blocks/(?P<block_id>\d+)/delete/?$",
+        views.IPBlocklist.as_view(),
+        name="settings-ip-blocks-delete",
+    ),
    # moderation
    re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
    re_path(