mastodon/app/models/form
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
..
account_batch.rb Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
admin_settings.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
challenge.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
custom_emoji_batch.rb Cache result of SQL (#14534) 2020-08-09 15:23:42 +02:00
delete_confirmation.rb Fix 2FA challenge and password challenge for non-database users (#11831) 2019-09-15 21:08:39 +02:00
domain_block_batch.rb Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
email_domain_block_batch.rb Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
ip_block_batch.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
redirect.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
status_filter_batch_action.rb Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
two_factor_confirmation.rb Fix TOTP codes not being filtered from logs during enabling/disabling (#11877) 2019-09-18 02:48:40 +02:00