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`. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| apps | ||
| emails | ||
| instances | ||
| lists | ||
| statuses | ||
| timelines | ||
| accounts_show_spec.rb | ||
| apps_spec.rb | ||
| blocks_spec.rb | ||
| bookmarks_spec.rb | ||
| domain_blocks_spec.rb | ||
| favourites_spec.rb | ||
| featured_tags_spec.rb | ||
| follow_requests_spec.rb | ||
| followed_tags_spec.rb | ||
| lists_spec.rb | ||
| mutes_spec.rb | ||
| polls_spec.rb | ||
| profiles_spec.rb | ||
| reports_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||