mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 21:08:07 +01:00
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. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper_spec.rb | ||
| application_helper_spec.rb | ||
| flashes_helper_spec.rb | ||
| formatting_helper_spec.rb | ||
| home_helper_spec.rb | ||
| instance_helper_spec.rb | ||
| json_ld_helper_spec.rb | ||
| languages_helper_spec.rb | ||
| media_component_helper_spec.rb | ||
| react_component_helper_spec.rb | ||
| routing_helper_spec.rb | ||
| self_destruct_helper_spec.rb | ||
| settings_helper_spec.rb | ||
| statuses_helper_spec.rb | ||
| theme_helper_spec.rb | ||