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 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2 years ago
..
credentials_controller.rb	Change user settings to be stored in a more optimal way (#23630)	2 years ago
familiar_followers_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	4 years ago
follower_accounts_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago
following_accounts_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago
identity_proofs_controller.rb	Remove Keybase integration (#17045)	3 years ago
lists_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
lookup_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago
notes_controller.rb	Add user notes on accounts (#14148)	4 years ago
pins_controller.rb	Make account endorsements idempotent (fix #19045) (#20118)	2 years ago
relationships_controller.rb	Do not filter out temporarily-suspended accounts from relationships API	4 years ago
search_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
statuses_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago