tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6deeeec2ed95609ee936d46e0267b95251c8af14
Mastodon/app/controllers
T
History
Claire b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
..
activitypub
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
2025-09-29 18:41:46 +02:00
admin
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
api
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
auth
Update rubocop-rails to version 2.33.0 (#35741)
2025-08-12 07:29:02 +00:00
concerns
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
2025-09-29 18:41:46 +02:00
disputes
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
filters
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
oauth
Move layout setup for OAuth views to controllers (#35176)
2025-06-25 13:26:17 +00:00
redirect
Move redirect/base body class to view (#31796)
2024-09-12 13:31:50 +00:00
settings
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
2025-09-10 18:11:12 +02:00
well_known
Update OAuth inflection to match spec (#35160)
2025-06-25 07:52:30 +00:00
about_controller.rb
…
accounts_controller.rb
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
2025-09-29 18:41:46 +02:00
application_controller.rb
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
authorize_interactions_controller.rb
…
backups_controller.rb
Change media attachments in moderated posts to not be accessible (#34872)
2025-06-12 08:53:02 +00:00
custom_css_controller.rb
Extend custom CSS cache time with digest paths (#33207)
2025-01-08 08:48:45 +00:00
emojis_controller.rb
…
filters_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
follower_accounts_controller.rb
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
2025-09-29 18:41:46 +02:00
following_accounts_controller.rb
Add support for numeric-based URIs for local accounts (#32724)
2025-09-29 12:05:48 +00:00
health_controller.rb
…
home_controller.rb
…
instance_actors_controller.rb
…
intents_controller.rb
…
invites_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
mail_subscriptions_controller.rb
…
manifests_controller.rb
…
media_controller.rb
Add coverage for media#player, move body class to view (#31790)
2024-09-06 16:46:25 +00:00
media_proxy_controller.rb
Change media attachments in moderated posts to not be accessible (#34872)
2025-06-12 08:53:02 +00:00
privacy_controller.rb
…
relationships_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
remote_interaction_helper_controller.rb
…
severed_relationships_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
shares_controller.rb
Move shares/modal body class to layout (#31789)
2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
statuses_controller.rb
Avoid return not_found in statuses controller (#35585)
2025-07-30 09:28:20 +00:00
tags_controller.rb
…
terms_of_service_controller.rb
Add interstitial for Terms of Service updates (#34527)
2025-05-16 14:03:05 +00:00