Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.

2023-10-17 20:59:18 +02:00

..

activitypub

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

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

admin

Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream

2023-09-02 15:02:29 +02:00

api

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

2023-09-15 21:39:21 +02:00

auth

Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

2023-10-08 16:48:19 +02:00

concerns

Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream

2023-10-17 20:59:18 +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

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +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 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream

2023-09-02 14:44:47 +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 '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

2023-10-08 17:26:43 +02:00

following_accounts_controller.rb

Fix Vary headers not being set on some redirects (#27272)

2023-10-05 09:50:08 +02:00

health_controller.rb

Change health check (#15988)

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

home_controller.rb

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +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

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +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 '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

2023-10-08 16:48:19 +02:00

tags_controller.rb

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00