mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
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. |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
application | ||
auth | ||
authorize_interactions | ||
directories | ||
disputes/strikes | ||
errors | ||
filters | ||
follower_accounts | ||
following_accounts | ||
home | ||
invites | ||
kaminari | ||
layouts | ||
media | ||
notification_mailer | ||
oauth | ||
public_timelines | ||
relationships | ||
remote_follow | ||
remote_interaction | ||
settings | ||
shared | ||
shares | ||
statuses | ||
statuses_cleanup | ||
tags | ||
user_mailer | ||
well_known/host_meta |