Merge branch 'release/6.0.27'

* release/6.0.27: compile assets fixes #956
austintoddj · Mar 23, 2021 · 0fb2138 · 0fb2138
2 parents 722235e + ac033e6
commit 0fb2138
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 107 deletions.
diff --git a/resources/stubs/controllers/CanvasUiController.stub b/resources/stubs/controllers/CanvasUiController.stub
@@ -86,7 +86,7 @@ class CanvasUiController extends Controller
     {
         $tag = Tag::firstWhere('slug', $slug);
 
-        return $tag ? response()->json($tag->posts()->with('topic')->paginate(), 200) : response()->json(null, 200);
+        return $tag ? response()->json($tag->posts()->with('topic', 'user')->paginate(), 200) : response()->json(null, 200);
     }
 
     /**
@@ -119,7 +119,7 @@ class CanvasUiController extends Controller
     {
         $topic = Topic::firstWhere('slug', $slug);
 
-        return $topic ? response()->json($topic->posts()->with('topic')->paginate(), 200) : response()->json(null, 200);
+        return $topic ? response()->json($topic->posts()->with('topic', 'user')->paginate(), 200) : response()->json(null, 200);
     }
 
     /**