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 d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		4 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
admin_mailer	…
application	…
auth	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
invites	…
kaminari	…
layouts	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
media	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
notification_mailer	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	4 years ago
oauth	…
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
relationships	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
shared	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	4 years ago
shares	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tags	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
user_mailer	…
well_known/host_meta	…