forked from treehouse/mastodon
9903e6beab
Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later). |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin/trends | ||
| announcements | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| announcements_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| streaming_controller_spec.rb | ||