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 f5a9971cac 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
..
action_dispatch	replace all instances of "ends_with?" with "end_with?" (#15745)	4 years ago
active_record	Remove dependency on pluck_each gem (#16012)	4 years ago
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	4 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Fixed code quality issues (#15541)	4 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
paperclip	Fixed code quality issues (#15541)	4 years ago
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
tasks	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Deal with collation-related index corruption (#14860)	4 years ago
enumerable.rb	Optimize map { ... }.compact calls (#15513)	4 years ago
exceptions.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	4 years ago