24e83246f9
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. |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
announcements | ||
apps | ||
crypto | ||
emails | ||
featured_tags | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
trends | ||
accounts_controller.rb | ||
announcements_controller.rb | ||
apps_controller.rb | ||
blocks_controller.rb | ||
bookmarks_controller.rb | ||
conversations_controller.rb | ||
custom_emojis_controller.rb | ||
directories_controller.rb | ||
domain_blocks_controller.rb | ||
endorsements_controller.rb | ||
favourites_controller.rb | ||
featured_tags_controller.rb | ||
filters_controller.rb | ||
follow_requests_controller.rb | ||
instances_controller.rb | ||
lists_controller.rb | ||
markers_controller.rb | ||
media_controller.rb | ||
mutes_controller.rb | ||
notifications_controller.rb | ||
polls_controller.rb | ||
preferences_controller.rb | ||
reports_controller.rb | ||
scheduled_statuses_controller.rb | ||
statuses_controller.rb | ||
streaming_controller.rb | ||
suggestions_controller.rb |