Merge branch 'master' into release_1_5

jazzband · Mar 22, 2021 · d7f08d5 · d7f08d5
2 parents 45ecc0e + 592398c
commit d7f08d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -14,6 +14,7 @@ Alessandro De Angelis
 Allisson Azevedo
 Anvesh Agarwal
 Aristóbulo Meneses
+Aryan Iyappan
 Ash Christopher
 Asif Saif Uddin
 Bart Merenda

diff --git a/docs/tutorial/tutorial_02.rst b/docs/tutorial/tutorial_02.rst
@@ -65,7 +65,9 @@ URL this view will respond to:
 
     urlpatterns = [
         # OAuth 2 endpoints:
-        path('o/', include(oauth2_endpoint_views, namespace="oauth2_provider")),
+        # need to pass in a tuple of the endpoints as well as the app's name
+        # because the app_name attribute is not set in the included module
+        path('o/', include((oauth2_endpoint_views, 'oauth2_provider'), namespace="oauth2_provider")),
         path('api/hello', ApiEndpoint.as_view()),  # an example resource endpoint
     ]