forked from treehouse/mastodon
1fbd1fa5c4
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`. |
||
|---|---|---|
| .. | ||
| account | ||
| account_gallery | ||
| account_timeline | ||
| audio | ||
| blocks | ||
| bookmarked_statuses | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| directory | ||
| domain_blocks | ||
| emoji | ||
| explore | ||
| favourited_statuses | ||
| favourites | ||
| follow_recommendations | ||
| follow_requests | ||
| followers | ||
| following | ||
| generic_not_found | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| introduction | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| picture_in_picture | ||
| pinned_statuses | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone | ||
| status | ||
| ui | ||
| video | ||