Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ...

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

2023-07-12 16:03:05 +02:00

..

accounts

…

admin

…

announcements

…

emails

…

featured_tags

…

instances

…

lists

…

polls

…

push

…

statuses

…

timelines

…

trends

…

accounts_controller_spec.rb

…

announcements_controller_spec.rb

…

blocks_controller_spec.rb

…

bookmarks_controller_spec.rb

…

conversations_controller_spec.rb

…

custom_emojis_controller_spec.rb

…

directories_controller_spec.rb

…

endorsements_controller_spec.rb

…

favourites_controller_spec.rb

…

filters_controller_spec.rb

…

followed_tags_controller_spec.rb

…

instances_controller_spec.rb

…

markers_controller_spec.rb

…

media_controller_spec.rb

…

mutes_controller_spec.rb

…

notifications_controller_spec.rb

…

polls_controller_spec.rb

…

preferences_controller_spec.rb

…

reports_controller_spec.rb

…

scheduled_statuses_controller_spec.rb

…

statuses_controller_spec.rb

…

streaming_controller_spec.rb

…