Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

disputes

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

health_controller_spec.rb

…

home_controller_spec.rb

Revert Home controller test to upstream

2022-10-28 20:12:04 +02:00

instance_actors_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

media_proxy_controller_spec.rb

…

relationships_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_cleanup_controller_spec.rb

…

statuses_controller_spec.rb

…

tags_controller_spec.rb

…