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
..
activitypub	Spelling (#17705)	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth	Fix suspicious sign-in mails never being sent (#18599)	2 years ago
concerns	Fix single Redis connection being used across all threads (#18135)	3 years ago
disputes	Add customizable user roles (#18641)	2 years ago
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
well_known	Remove Keybase integration (#17045)	3 years ago
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
account_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
account_unfollow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
accounts_controller_spec.rb	Spelling (#17705)	3 years ago
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
authorize_interactions_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
emojis_controller_spec.rb	Misc. typos (#8694)	6 years ago
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	Fix glitch-soc-specific health check spec	4 years ago
home_controller_spec.rb	Change routing paths to use usernames in web UI (#16171)	3 years ago
instance_actors_controller_spec.rb	Fix instance actor not being dereferenceable (#17457)	3 years ago
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller_spec.rb	Add customizable user roles (#18641)	2 years ago
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
media_controller_spec.rb	Fix error when rendering public pages with media attachments (#16763)	3 years ago
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	4 years ago
remote_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	6 years ago
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	5 years ago
statuses_cleanup_controller_spec.rb	Add feature to automatically delete old toots (#16529)	3 years ago
statuses_controller_spec.rb	Spelling (#17705)	3 years ago
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	6 years ago