glitchier-soc/app
Claire b7882a75d2 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +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-02-10 19:09:27 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
mailers Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +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-02-09 17:28:33 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-08 18:23:53 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +01:00