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 b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.		1 year 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 commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' 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	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	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	Add time zone preference (#25342)	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 commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year 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	Add time zone preference (#25342)	1 year ago
well_known/host_meta	Enable Rubocop for app/views (#23874)	2 years ago