fef055db96
Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly. |
||
|---|---|---|
| .. | ||
| direct_spec.rb | ||
| home_spec.rb | ||
| link_spec.rb | ||
| list_spec.rb | ||
| public_spec.rb | ||
| tag_spec.rb | ||