mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 18:14:15 -05: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`. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| familiar_followers_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| lookup_controller_spec.rb | ||
| notes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||