Merge branch '2.x' of github.com:stancl/tenancy into 2.x

README.md

@@ -30,5 +30,5 @@ The repository with the documentation source code can be found here: [stancl/ten
 
 ### Credits
 
-- Created by [Samuel Štancl](https://github.com/stancl)
-- Logo by [Caneco](https://twitter.com/caneco)
+- Created by [Samuel Štancl](https://twitter.com/samuelstancl)
+- Logo by [Brian Dillingham](https://twitter.com/dillinghammm)

assets/config.php

@@ -67,7 +67,7 @@ return [
     ],
 
     /**
-     * Controller namespace used for routes in routes/tenant.php.
+     * Controller namespace used by routes in routes/tenant.php.
      */
     'tenant_route_namespace' => 'App\Http\Controllers',
 

src/Features/TelescopeTags.php

@@ -31,6 +31,10 @@ class TelescopeTags implements Feature
         Telescope::tag(function (IncomingEntry $entry) {
             $tags = $this->getTags($entry);
 
+            if (! request()->route()) {
+                return $tags;
+            }
+
             $tenantRoute = PreventAccessFromTenantDomains::routeHasMiddleware(request()->route(), 'tenancy')
                 || PreventAccessFromTenantDomains::routeHasMiddleware(request()->route(), 'universal');