mastodon/config/environments
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
development.rb Fix warnings on Rails boot (#16946) 2021-12-27 00:47:20 +01:00
production.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
test.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +01:00