You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		1 year ago
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	3 years ago
controllers	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
helpers	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	1 year ago
javascript	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
lib	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago
mailers	Add unsubscribe link to e-mails (#25378)	1 year ago
models	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2 years ago
serializers	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream	1 year ago
services	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream	1 year ago
validators	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2 years ago
views	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
workers	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago