Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.

2022-11-10 09:36:47 +01:00

..

direct_controller.rb

Remove deprecated REST API GET /api/v1/timelines/direct (#11212)

2019-07-05 02:14:56 +02:00

home_controller.rb

Remove useless respond_to calls (#13208)

2020-03-06 01:29:38 +01:00

list_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

public_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-10 09:36:47 +01:00

tag_controller.rb

Remove language filtering from hashtag timelines (#19563)

2022-10-30 21:29:23 +01:00