Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well.		2022-03-10 09:52:45 +01:00
..
_actions.html.haml	Add ability to mark statuses as sensitive from reports in admin UI (#17668)	2022-03-01 22:20:29 +01:00
_status.html.haml	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
index.html.haml	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 21:15:37 +01:00