mastodon/lib/tasks
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
assets.rake
auto_annotate_models.rake
branding.rake Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
db.rake Fix null values being included in some indexes (#17711) 2022-03-12 08:12:57 +01:00
emojis.rake Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
glitchsoc.rake
mastodon.rake Fix typos (#18604) 2022-08-28 17:44:34 +02:00
repo.rake Remove language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statistics.rake
tests.rake Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00