mastodon/app/views/statuses
Claire 0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
_og_description.html.haml
_og_image.html.haml Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
_poll.html.haml Fix haml-lint `ConsecutiveSilentScripts` rule (#26043) 2023-07-18 09:25:37 +02:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
_status.html.haml Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +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 Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947) 2023-07-17 18:18:13 +02:00