Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.

2024-08-02 18:09:48 +02:00

..

v1

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

2024-08-02 18:09:48 +02:00

v2

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

2024-01-24 20:42:53 +01:00

v2_alpha

Change grouped notifications API shape (take 2) (#31214)

2024-07-31 10:50:13 +00:00

web

Improve spec coverage for api/web/push_subscriptions controller (#27858)

2023-11-15 13:14:51 +00:00

base_controller.rb

Add endpoints for unread notifications count (#31191)

2024-07-30 08:39:11 +00:00

oembed_controller.rb

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00