Thibaut Girka 78fa15d08f Merge branch 'master' into glitch-soc/master ... Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.		2020-08-11 19:19:27 +02:00
..
account_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
admin_settings.rb	Add support for setting Content Warning for CW-less outgoing toots	2020-05-30 18:27:00 +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
redirect.rb	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +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