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
..
exports	…
migration	…
preferences	…
two_factor_authentication	…
aliases_controller.rb	…
applications_controller.rb	…
base_controller.rb	…
deletes_controller.rb	…
exports_controller.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
featured_tags_controller.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
flavours_controller.rb	…
imports_controller.rb	…
login_activities_controller.rb	…
migrations_controller.rb	…
pictures_controller.rb	…
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
profiles_controller.rb	…
sessions_controller.rb	…
two_factor_authentication_methods_controller.rb	…