Jeremy Kescher 2cb88f5baa Merge remote-tracking branch 'upstream/main' into develop ... Conflicts: - .github/workflows/build-image.yml We don't use GitHub Actions for building Docker images. - Gemfile.lock Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.		2023-03-19 01:57:28 +01:00
..
chewy	Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)".	2022-05-26 20:58:16 +02:00
controllers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-18 11:21:03 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
mailers	Add mail headers to avoid auto-replies (#23597)	2023-03-03 20:44:46 +01:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Remove unused InstancePresenter#sample_accounts method (#23900)	2023-02-27 19:03:35 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop, bump version	2023-03-17 07:27:28 +01:00