nyastodon/app
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
mailers Remove digest e-mails (#17985) 2022-08-25 23:38:22 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
presenters Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00