Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| actions | ||
| api | ||
| api_types | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| models | ||
| polyfills | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| store | ||
| utils | ||
| api.ts | ||
| blurhash.ts | ||
| common.js | ||
| compare_id.ts | ||
| identity_context.tsx | ||
| 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_helpers.tsx | ||
| test_setup.js | ||
| uuid.ts | ||