mastodon/app/controllers
Claire 11368da545 Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
admin Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
api Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
auth Change captcha to be presented even for invited users (#2227) 2023-05-25 20:13:18 +02:00
concerns Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +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 branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
settings Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
well_known Add fallback redirection when getting a webfinger query `LOCAL_DOMAIN@LOCAL_DOMAIN` (#23600) 2023-05-02 17:42:42 +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 branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
authorize_interactions_controller.rb Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
backups_controller.rb Fix user archive takeouts when using OpenStack Swift (#24431) 2023-04-05 19:31:49 +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 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
following_accounts_controller.rb Change logged-out WebUI HTML pages to be cached for a few seconds (#24708) 2023-04-28 10:27:26 +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
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 branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
media_proxy_controller.rb Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +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
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 branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tags_controller.rb Change logged-out WebUI HTML pages to be cached for a few seconds (#24708) 2023-04-28 10:27:26 +02:00