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.

Eugen Rochko bf3cb42da7 Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) ... Cherry-picked d2528b26b6 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.		2 years ago
..
about	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2 years ago
admin_mailer	Change how hashtags are normalized (#18795)	2 years ago
application	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
authorize_interactions	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
custom_css	Fix badge color not affected (#18826)	2 years ago
directories	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
disputes/strikes	Fix ambiguous wording on appeal actions (#18328)	2 years ago
errors	Add specific rate limits for posting and following (#13172)	5 years ago
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2 years ago
follower_accounts	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
following_accounts	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
home	[Glitch] Allow non-logged users to access /web	2 years ago
invites	Remove invite comments from UI (#12068)	5 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
media	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
notification_mailer	Remove digest e-mails (#17985)	2 years ago
oauth	Change visual separation of applications in authorized apps list (#17686)	3 years ago
privacy	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
relationships	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
remote_follow	Admission-based registrations mode (#10250)	6 years ago
remote_interaction	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
shared	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
shares	Merge branch 'master' into glitch-soc/merge-upstream	5 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	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
user_mailer	Change path of privacy policy page (#19249)	2 years ago
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	4 years ago