mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 19:10:22 -05: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` |
||
|---|---|---|
| .. | ||
| actions | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| polyfills | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| store | ||
| utils | ||
| api.js | ||
| blurhash.ts | ||
| common.js | ||
| compare_id.ts | ||
| initial_state.js | ||
| is_mobile.ts | ||
| load_keyboard_extensions.js | ||
| main.jsx | ||
| performance.js | ||
| permissions.ts | ||
| ready.js | ||
| scroll.ts | ||
| settings.js | ||
| stream.js | ||
| test_setup.js | ||
| uuid.ts | ||