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

…

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

…

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

…

backups_controller.rb

…

custom_css_controller.rb

Add scope providing_styles to UserRole (#29286)

2024-02-20 09:18:05 +00:00

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

Remove redundant return in IntentsController (#29099)

2024-02-06 12:56:22 +00:00

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

…