merges 5.5 and master into next-back

2025-10-12 15:34:26 +02:00 · 2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
--- a/src/Api/Serializer/DiscussionSerializer.php
+++ b/src/Api/Serializer/DiscussionSerializer.php
@@ -64,12 +64,4 @@ class DiscussionSerializer extends BasicDiscussionSerializer

        return $attributes;
    }
-
-    /**
-     * @return \Tobscure\JsonApi\Relationship
-     */
-    protected function hideUser($discussion)
-    {
-        return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserSerializer');
-    }
 }