diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 19:48:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 19:48:05 +0100 |
| commit | d602c92b310545eb733a58caed49717341abe27c (patch) | |
| tree | 59b020274695be37d47d0a4c98962c2677e621e6 /app/controllers/api | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | d90da7d080d25355290e5d5e86c2c918d685add7 (diff) | |
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/statuses/histories_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses/histories_controller.rb b/app/controllers/api/v1/statuses/histories_controller.rb index c2c1fac5d..7fe73a6f5 100644 --- a/app/controllers/api/v1/statuses/histories_controller.rb +++ b/app/controllers/api/v1/statuses/histories_controller.rb @@ -7,7 +7,7 @@ class Api::V1::Statuses::HistoriesController < Api::BaseController before_action :set_status def show - render json: @status.edits, each_serializer: REST::StatusEditSerializer + render json: @status.edits.includes(:account, status: [:account]), each_serializer: REST::StatusEditSerializer end private |