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 488cd37f1a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		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	Setup haml-lint CI with todo config (#23524)	2 years ago
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
media	Merge branch 'main' into glitch-soc/merge-upstream	4 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	Merge branch 'main' into glitch-soc/merge-upstream	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