Claire 1cd7f5ff17 Merge commit 'd27216dc46' into glitch-soc/merge-upstream ... Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.		2023-05-28 15:54:31 +02:00
..
chewy	Change algorithm of tootctl search deploy to improve performance (#18463)	2022-05-22 22:16:43 +02:00
controllers	Merge commit 'b896b16cb3' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
helpers	Merge commit 'b896b16cb3' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
javascript	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
lib	Merge commit 'e387175fc9' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
mailers	Add user handle to notification mail recipient address (#24240)	2023-04-17 11:06:06 +02:00
models	Merge commit 'b896b16cb3' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge commit 'b896b16cb3' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
services	Merge commit 'e387175fc9' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
validators	Merge commit 'e387175fc9' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
views	Merge commit 'e387175fc9' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
workers	Merge commit '4a22e72b9b' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00