You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/models/form
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
5 years ago
..
account_batch.rb Fix slow distinct queries where grouped queries are faster (#15287) 5 years ago
admin_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
challenge.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 6 years ago
custom_emoji_batch.rb Cache result of SQL (#14534) 5 years ago
delete_confirmation.rb Fix 2FA challenge and password challenge for non-database users (#11831) 6 years ago
ip_block_batch.rb Add IP-based rules (#14963) 5 years ago
redirect.rb Remove dependency on goldfinger gem (#14919) 5 years ago
status_batch.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 6 years ago
tag_batch.rb Add batch approve/reject for pending hashtags in admin UI (#11791) 6 years ago
two_factor_confirmation.rb Fix TOTP codes not being filtered from logs during enabling/disabling (#11877) 6 years ago