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 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
seeds	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
views	Fix some old migration scripts (#17394)	2022-01-30 21:38:54 +01:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
seeds.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00