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 cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.		3 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
accounts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin_mailer	…
application	…
auth	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions	…
directories	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
errors	…
filters	…
follower_accounts	…
following_accounts	Improve blocked view of profiles (#10491)	6 years ago
home	…
invites	…
kaminari	…
layouts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
media	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
notification_mailer	…
oauth	…
public_timelines	…
relationships	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
remote_follow	Admission-based registrations mode (#10250)	6 years ago
remote_interaction	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
shared	…
shares	…
statuses	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
tags	…
user_mailer	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	3 years ago
well_known/host_meta	…