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.
2020-12-15 14:27:06 +01:00
..
account_batch.rb Fix slow distinct queries where grouped queries are faster (#15287) 2020-12-07 12:08:30 +01:00
admin_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01: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
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_batch.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
tag_batch.rb Add batch approve/reject for pending hashtags in admin UI (#11791) 2019-09-09 12:50:09 +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