Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

admin

…

filters

…

notifications

Add policy to filter notifications from bots (#38494) (#38809)

2026-06-09 12:28:53 +00:00

filters_controller.rb

…

instances_controller.rb

Change /api/v2/instance to be enabled without authentication when limited federation mode is enabled (#34576)

2025-05-09 07:46:57 +00:00

media_controller.rb

…

notifications_controller.rb

Add fallback attributes to notifications for new and infrequent notifications (#38832)

2026-04-29 15:53:29 +00:00

search_controller.rb

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

2025-08-05 15:46:33 +02:00

suggestions_controller.rb

Add FASP follow recommendation support (#34964)

2025-06-16 10:43:27 +00:00