mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. |
||
|---|---|---|
| .. | ||
| delivery_worker.rb | ||
| distribute_poll_update_worker.rb | ||
| distribution_worker.rb | ||
| fetch_replies_worker.rb | ||
| low_priority_delivery_worker.rb | ||
| move_distribution_worker.rb | ||
| post_upgrade_worker.rb | ||
| processing_worker.rb | ||
| raw_distribution_worker.rb | ||
| reply_distribution_worker.rb | ||
| synchronize_featured_collection_worker.rb | ||
| update_distribution_worker.rb | ||