c2817c7fad
Conflicts: - `app/lib/feed_manager.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes. - `app/workers/feed_insert_worker.rb`: Ditto. |
||
|---|---|---|
| .. | ||
| environments | ||
| imagemagick | ||
| initializers | ||
| locales | ||
| locales-glitch | ||
| routes | ||
| templates | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.yml | ||
| captcha.yml | ||
| database.yml | ||
| environment.rb | ||
| formatjs-formatter.js | ||
| i18n-tasks.yml | ||
| mastodon.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| roles.yml | ||
| routes.rb | ||
| settings.yml | ||
| sidekiq.yml | ||
| storage.yml | ||
| translation.yml | ||
| webpacker.yml | ||