treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/controllers
History
Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.
 		2024-02-27 19:20:57 +01:00
..
activitypub Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 2024-02-24 14:46:14 +01:00
admin Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
api Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
auth Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 2024-02-24 14:46:14 +01:00
concerns Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 2024-02-24 14:46:14 +01:00
disputes Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
oauth Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
redirect Fix CSS loading in redirect controller 2024-01-26 21:04:02 +01:00
settings Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
well_known Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` (#28592) 2024-01-04 14:14:46 +00:00
about_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
accounts_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
application_controller.rb Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 2024-02-27 19:20:57 +01:00
authorize_interactions_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
backups_controller.rb Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
custom_css_controller.rb Add scope `providing_styles` to `UserRole` (#29286) 2024-02-20 09:18:05 +00:00
emojis_controller.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
filters_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01: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 Disable `Rails/ApplicationController` for `HealthController` (#28705) 2024-01-12 09:08:17 +00: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 Remove redundant `return` in `IntentsController` (#29099) 2024-02-06 12:56:22 +00: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 commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 2023-12-21 19:31:12 +01:00
remote_interaction_helper_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
shares_controller.rb
…
statuses_cleanup_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01: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