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
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	3 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Prevent use locale with empty string (#18543)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Add customizable user roles (#18641)	2 years ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago