mastodon/app
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
..
chewy Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
mailers Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00