mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
9a3d91f629
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's. |
||
---|---|---|
.. | ||
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 | ||
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 |