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
..
about	Change public accounts pages to mount the web UI (#19319)	2 years ago
accounts	Enable Rubocop for app/views (#23874)	2 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin_mailer	Add support for language preferences for trending statuses and links (#18288)	2 years ago
application	Fix more haml-lint Rubocop (#24107)	2 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
authorize_interactions	Fix links to the Web UI in notifications (#19981)	2 years ago
custom_css	Fix badge color not affected (#18826)	2 years ago
disputes/strikes	Fix incorrect post links in strikes when the account is remote (#23611)	2 years ago
errors	Add specific rate limits for posting and following (#13172)	5 years ago
filters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2 years ago
following_accounts	Change public accounts pages to mount the web UI (#19319)	2 years ago
home	Change public accounts pages to mount the web UI (#19319)	2 years ago
invites	Remove invite comments from UI (#12068)	5 years ago
kaminari	Fix missing translation in pagination gap tags (#24262)	2 years ago
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
media	Fix glitch-soc HAML linting issues (#2166)	2 years ago
notification_mailer	Fix more haml-lint Rubocop (#24107)	2 years ago
oauth	Setup haml-lint CI with todo config (#23524)	2 years ago
privacy	Change public accounts pages to mount the web UI (#19319)	2 years ago
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
settings	Fix default content type setting not applying (#2176)	2 years ago
shared	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
shares	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
statuses_cleanup	Add feature to automatically delete old toots (#16529)	3 years ago
tags	Enable Rubocop for app/views (#23874)	2 years ago
user_mailer	Change user backups to use expiring URLs for download when possible (#24136)	2 years ago
well_known/host_meta	Enable Rubocop for app/views (#23874)	2 years ago