You cannot 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 92c06a1113 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.		3 years ago
..
activitypub	Spelling (#17705)	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
auth	Fix suspicious sign-in mails never being sent (#18599)	3 years ago
concerns	Fix single Redis connection being used across all threads (#18135)	3 years ago
disputes	Add customizable user roles (#18641)	3 years ago
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
well_known	Remove Keybase integration (#17045)	3 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Spelling (#17705)	3 years ago
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
following_accounts_controller_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	Fix instance actor not being dereferenceable (#17457)	3 years ago
intents_controller_spec.rb	…
invites_controller_spec.rb	Add customizable user roles (#18641)	3 years ago
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix error when rendering public pages with media attachments (#16763)	3 years ago
media_proxy_controller_spec.rb	…
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	…
statuses_controller_spec.rb	Spelling (#17705)	3 years ago
tags_controller_spec.rb	…