You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
account_batch.rb	Fix slow distinct queries where grouped queries are faster (#15287)	4 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
challenge.rb	…
custom_emoji_batch.rb	…
delete_confirmation.rb	…
ip_block_batch.rb	Add IP-based rules (#14963)	4 years ago
redirect.rb	Remove dependency on goldfinger gem (#14919)	4 years ago
status_batch.rb	…
tag_batch.rb	…
two_factor_confirmation.rb	…