Merge remote-tracking branch 'origin/main' into pagination

strawberry-graphql · Oct 19, 2024 · 836c227 · 836c227
2 parents 4c9c068 + 92c1221
commit 836c227
Show file tree

Hide file tree

Showing 3 changed files with 1,059 additions and 22 deletions.
diff --git a/docs/guide/subscriptions.md b/docs/guide/subscriptions.md
@@ -45,27 +45,7 @@ application = AuthGraphQLProtocolTypeRouter(
 )
 ```
 
-Also, ensure that you enable subscriptions on your AsgiGraphQLView in `MyProject.urls.py`:
-
-```python
-...
-
-urlpatterns = [
-	...
-    path(
-        'graphql/',
-        AsyncGraphQLView.as_view(
-            schema=schema,
-            graphiql=settings.DEBUG,
-            subscriptions_enabled=True,
-        ),
-    ),
-    ...
-]
-
-```
-
-Note, django-channels allows for a lot more complexity. Here we merely cover the basic framework to get subscriptions to run on Django with minimal effort. Should you be interested in discovering the far more advanced capabilities of Dango channels, head over to [channels docs](https://channels.readthedocs.io)
+Note, django-channels allows for a lot more complexity. Here we merely cover the basic framework to get subscriptions to run on Django with minimal effort. Should you be interested in discovering the far more advanced capabilities of Django channels, head over to [channels docs](https://channels.readthedocs.io)
 
 ## Setup local testing
 

diff --git a/strawberry_django/mutations/resolvers.py b/strawberry_django/mutations/resolvers.py
@@ -527,7 +527,7 @@ def update_m2m(
     key_attr: str | None = None,
     full_clean: bool | FullCleanOptions = True,
 ):
-    if value is UNSET:
+    if value in (None, UNSET):  # noqa: PLR6201
         return
 
     # FIXME / NOTE:  Should this be here?