mastodon-docker-playground/app/helpers/admin
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
..
trends Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
account_moderation_notes_helper.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
action_logs_helper.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
announcements_helper.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
dashboard_helper.rb Fix admin interface crash when displaying deleted user (#17301) 2022-01-16 20:57:37 +01:00
filter_helper.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
settings_helper.rb Add optional hCaptcha support 2022-01-24 21:22:13 +01:00