mastodon-glitch/app/views/statuses
Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
_og_description.html.haml
_og_image.html.haml Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +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-03-26 19:18:55 +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 og:published_time to opengraph meta tags (#14865) 2020-09-24 23:32:13 +02:00