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 06a878c6b5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		2 years ago
..
active_record	Remove dependency on pluck_each gem (#16012)	4 years ago
assets	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	3 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	2 years ago
paperclip	Remove dependency on running Redis server for db:setup (#18560)	2 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	Fix link sanitization for outgoing text/html and text/markdown toots	3 years ago
simple_navigation	Add customizable user roles (#18641)	2 years ago
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
terrapin	Add Ruby 3.0 support (#16046)	4 years ago
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	3 years ago
enumerable.rb	Optimize map { ... }.compact calls (#15513)	4 years ago
exceptions.rb	Fix error resposes for `from` search prefix (#17963)	3 years ago