Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ...

Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.

2024-01-13 12:11:29 +01:00

..

activitypub

…

admin

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

2024-01-10 17:51:12 +01:00

api

Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream

2024-01-11 13:24:20 +01:00

auth

Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream

2023-12-21 19:31:12 +01:00

concerns

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

2024-01-10 17:51:12 +01:00

disputes

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

filters

…

oauth

Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream

2023-12-20 22:05:31 +01:00

settings

Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream

2023-12-20 22:05:31 +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

…

accounts_controller.rb

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

application_controller.rb

Fix self-destruct page not using theme styles (#2490)

2023-12-02 14:54:35 +01:00

authorize_interactions_controller.rb

…

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

…

emojis_controller.rb

…

filters_controller.rb

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

health_controller.rb

Disable Rails/ApplicationController for HealthController (#28705)

2024-01-12 09:08:17 +00:00

home_controller.rb

…

instance_actors_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

mail_subscriptions_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

privacy_controller.rb

…

relationships_controller.rb

Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream

2023-12-21 19:31:12 +01:00

remote_interaction_helper_controller.rb

…

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

…

tags_controller.rb

…