mastodon/app/views/statuses
Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
2023-02-03 19:23:27 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
_og_description.html.haml
_og_image.html.haml Change link previews for statuses to never use avatar as fallback (#23376) 2023-02-03 10:16:47 +01:00
_poll.html.haml Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
_status.html.haml Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288) 2022-01-23 15:52:58 +01:00
embed.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
show.html.haml Add user profile OG tag on status page (#21423) 2022-11-27 20:45:28 +01:00