mastodon/spec
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
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
fabricators Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
features
fixtures Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
helpers Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +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-10-02 18:46:22 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
requests Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
routing
serializers/activitypub
services Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
support Spelling (#17705) 2022-03-06 22:51:40 +01: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-03-04 01:07:49 +01:00
workers Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
rails_helper.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00