mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 06:09:08 +09:00
b867d4581e
Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`. |
||
|---|---|---|
| .. | ||
| api | ||
| account_show_page_spec.rb | ||
| anonymous_cookies_spec.rb | ||
| backups_spec.rb | ||
| cache_spec.rb | ||
| catch_all_route_request_spec.rb | ||
| content_security_policy_spec.rb | ||
| follower_accounts_spec.rb | ||
| following_accounts_spec.rb | ||
| host_meta_request_spec.rb | ||
| link_headers_spec.rb | ||
| localization_spec.rb | ||
| mail_subscriptions_spec.rb | ||
| omniauth_callbacks_spec.rb | ||
| webfinger_request_spec.rb | ||