Merge branch 'master' into remove-unused-imports

2025-10-10 11:33:01 +00:00 · 2020-10-01 12:07:37 +02:00
parent e93cc83d58 9f8c1decc4
commit 4cbc0bad34
90 changed files with 2005 additions and 1110 deletions
--- a/jupyterhub/tests/test_api.py
+++ b/jupyterhub/tests/test_api.py
@@ -1513,6 +1513,7 @@ async def test_get_services(app, mockservice_url):
            'prefix': mockservice.server.base_url,
            'url': mockservice.url,
            'info': {},
+            'display': True,
        }
    }

@@ -1537,6 +1538,7 @@ async def test_get_service(app, mockservice_url):
        'prefix': mockservice.server.base_url,
        'url': mockservice.url,
        'info': {},
+        'display': True,
    }

    r = await api_request(