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 e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
fabricators	Add canonical e-mail blocks for suspended accounts (#16049)	4 years ago
features	…
fixtures	…
helpers	…
lib	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
mailers	…
models	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
support	…
validators	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…