mirror of
https://github.com/funamitech/mastodon
synced 2024-12-16 23:59:11 +09:00
0092fe50ac
Conflicts: - `.github/workflows/build-image.yml`: Upstream entirely refactored this, while we changed the docker repository to upload to and disabled the “latest” tag. Applied the repository change to `.github/workflows/build-*.yml`, as well as disabling native ARMv64 builds. - `README.md`: We have a completely different README. Kept ours. - `app/views/admin/settings/shared/_links.html.haml`: Upstream refactored, we had an extra item. Refactored as upstream did. - `spec/controllers/api/v1/timelines/public_controller_spec.rb`: Upstream deleted this file, to be replaced by a request spec at `spec/requests/api/v1/timelines/public_spec.rb`. We had an extra bit about enabling the public timelines because we have different defaults than upstream. Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| featured_tags | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_controller_spec.rb | ||
| announcements_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| directories_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| followed_tags_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| media_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| preferences_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| scheduled_statuses_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||