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 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.		1 year ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	1 year ago
api	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	1 year ago
auth	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	1 year ago
concerns	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	1 year ago
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
filters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
oauth	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2 years ago
settings	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
well_known	Change interaction modal in web UI (#26075)	1 year ago
about_controller.rb	Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)	2 years ago
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application_controller.rb	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	1 year ago
authorize_interactions_controller.rb	Change interaction modal in web UI (#26075)	1 year ago
backups_controller.rb	Storage: add :azure to remaining callers (#26080)	1 year ago
custom_css_controller.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
emojis_controller.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
filters_controller.rb	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2 years ago
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
following_accounts_controller.rb	Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)	2 years ago
health_controller.rb	Change health check (#15988)	4 years ago
home_controller.rb	Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)	2 years ago
instance_actors_controller.rb	Fix /actor needlessly reading session cookie and varying on Signature (#24664)	2 years ago
intents_controller.rb	Fix Performance/DeletePrefix cop (#24796)	2 years ago
invites_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mail_subscriptions_controller.rb	Add unsubscribe link to e-mails (#25378)	1 year ago
manifests_controller.rb	Fix some user-independent endpoints potentially reading session cookies (#24650)	2 years ago
media_controller.rb	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	1 year ago
media_proxy_controller.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2 years ago
privacy_controller.rb	Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)	2 years ago
relationships_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
remote_interaction_helper_controller.rb	Change interaction modal in web UI (#26075)	1 year ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_cleanup_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
statuses_controller.rb	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	1 year ago
tags_controller.rb	Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)	2 years ago