Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
This commit is contained in:
Claire 2022-02-09 17:28:33 +01:00
commit 322e907e04
28 changed files with 645 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/statuses/histories_controller.rb
View file

@ -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