tootlab-mastodon/spec/controllers/api/v1
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
accounts
admin
announcements
apps
emails
instances
lists
polls
push
statuses
timelines
trends
accounts_controller_spec.rb
announcements_controller_spec.rb
apps_controller_spec.rb
blocks_controller_spec.rb
bookmarks_controller_spec.rb
conversations_controller_spec.rb
custom_emojis_controller_spec.rb
domain_blocks_controller_spec.rb
endorsements_controller_spec.rb
favourites_controller_spec.rb
filters_controller_spec.rb
follow_requests_controller_spec.rb
instances_controller_spec.rb
lists_controller_spec.rb
markers_controller_spec.rb
media_controller_spec.rb
mutes_controller_spec.rb
notifications_controller_spec.rb
polls_controller_spec.rb
reports_controller_spec.rb
statuses_controller_spec.rb
streaming_controller_spec.rb
suggestions_controller_spec.rb