tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/controllers
History
Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
..
activitypub
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-29 10:44:56 +02:00
admin
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
2023-06-25 14:27:38 +02:00
api
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
2023-07-12 16:03:05 +02:00
auth
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
2023-07-12 16:03:05 +02:00
concerns
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
2023-07-12 16:03:05 +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 '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
2023-06-18 13:41:33 +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 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
backups_controller.rb
Add allow_other_host: true to backups controller (#25266)
2023-06-05 08:22:03 +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 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
…
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 unsubscribe link to e-mails (#25378)
2023-06-12 14:22:46 +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 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +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
…
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 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +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