Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.

2024-09-16 21:08:58 +02:00

..

admin

…

filters

…

notifications

Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840)

2024-09-16 12:10:02 +00:00

filters_controller.rb

Eager loading fixes for api/ controllers (#28848)

2024-01-23 11:41:54 +00:00

instances_controller.rb

…

media_controller.rb

Add coverage for api/v2/media endpoint (#28027)

2023-11-22 15:39:34 +00:00

notifications_controller.rb

Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840)

2024-09-16 12:10:02 +00:00

search_controller.rb

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

2023-12-21 19:42:13 +01:00

suggestions_controller.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00