This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/api
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
..
v1 Add ability to change content-type when editing a toot 2022-02-10 19:10:14 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
web Add notifications for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
base_controller.rb Add logging of S3-related errors (#16381) 2021-07-21 18:34:39 +02:00
oembed_controller.rb