glitchier-soc/app
Claire de7f936b96 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 22:29:05 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
mailers Fix error on trending mailer due to missing constant (#17072) 2021-11-29 17:39:40 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00