This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
aliases	…
applications	Update haml-lint 0.49.1 (#26118)	2023-07-23 17:48:16 +02:00
deletes	…
exports	Change user backups to use expiring URLs for download when possible (#24136)	2023-03-16 22:46:52 +01:00
featured_tags	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00
flavours	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
imports	Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948)	2023-07-17 16:57:18 +02:00
login_activities	Fix haml-lint `ConsecutiveSilentScripts` rule (#26043)	2023-07-18 09:25:37 +02:00
migration/redirects	…
migrations	…
preferences	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
profiles	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
shared	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00
two_factor_authentication	…
two_factor_authentication_methods	…
verifications	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00