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
..
access_token_tracking_concern.rb	…
account_controller_concern.rb	…
account_owned_concern.rb	…
accountable_concern.rb	…
admin_export_controller_concern.rb	…
authorization.rb	…
cache_concern.rb	…
captcha_concern.rb	…
challengable_concern.rb	…
export_controller_concern.rb	…
localized.rb	…
rate_limit_headers.rb	…
registration_spam_concern.rb	…
session_tracking_concern.rb	…
signature_authentication.rb	…
signature_verification.rb	…
status_controller_concern.rb	…
theming_concern.rb	…
two_factor_authentication_concern.rb	…
user_tracking_concern.rb	…