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 cb70bb8665 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		1 year ago
..
about	Change public accounts pages to mount the web UI (#19319)	2 years ago
accounts	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	1 year ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
admin_mailer	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	1 year ago
application	Add card with who invited you to join when displaying rules on sign-up (#23475)	1 year ago
auth	Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream	1 year 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	1 year 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	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
kaminari	Fix missing translation in pagination gap tags (#24262)	2 years ago
layouts	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
mail_subscriptions	Add unsubscribe link to e-mails (#25378)	1 year ago
media	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
notification_mailer	Fix ArgumentError in mailers when a user's timezone is blank (#26025)	1 year ago
oauth	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	1 year 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	1 year ago
shared	Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream	1 year ago
shares	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
statuses	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
statuses_cleanup	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
user_mailer	Fix ArgumentError in mailers when a user's timezone is blank (#26025)	1 year ago
well_known/host_meta	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago