Claire ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.

2023-09-02 13:50:16 +02:00

..

activitypub

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

admin

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

api

Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream

2023-09-02 13:50:16 +02:00

auth

Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream

2023-07-30 14:58:56 +02:00

concerns

Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream

2023-09-02 13:31:15 +02:00

disputes

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

filters

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

oauth

Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

2023-05-25 22:59:30 +02:00

settings

Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream

2023-09-02 11:41:40 +02:00

well_known

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

about_controller.rb

Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)

2023-04-28 10:27:26 +02:00

accounts_controller.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

application_controller.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

authorize_interactions_controller.rb

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

backups_controller.rb

Storage: add :azure to remaining callers (#26080)

2023-07-27 16:13:45 +02:00

custom_css_controller.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

emojis_controller.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

filters_controller.rb

Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

2023-05-08 15:28:36 +02:00

follower_accounts_controller.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

following_accounts_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

health_controller.rb

Change health check (#15988)

2021-04-03 02:39:04 +02:00

home_controller.rb

Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)

2023-04-28 10:27:26 +02:00

instance_actors_controller.rb

Fix /actor needlessly reading session cookie and varying on Signature (#24664)

2023-04-26 11:42:26 +02:00

intents_controller.rb

Fix Performance/DeletePrefix cop (#24796)

2023-05-02 21:07:45 +02:00

invites_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

mail_subscriptions_controller.rb

Add List-Unsubscribe email header (#26085)

2023-08-01 19:34:40 +02:00

manifests_controller.rb

Fix some user-independent endpoints potentially reading session cookies (#24650)

2023-04-25 22:14:44 +02:00

media_controller.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

media_proxy_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

privacy_controller.rb

Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)

2023-04-28 10:27:26 +02:00

relationships_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

remote_interaction_helper_controller.rb

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

shares_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-19 21:49:35 +02:00

statuses_cleanup_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

statuses_controller.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

tags_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00