mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
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`. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller_spec.rb | ||
| account_follow_controller_spec.rb | ||
| account_unfollow_controller_spec.rb | ||
| accounts_controller_spec.rb | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| emojis_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| health_controller_spec.rb | ||
| home_controller_spec.rb | ||
| instance_actors_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| manifests_controller_spec.rb | ||
| media_controller_spec.rb | ||
| media_proxy_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| remote_follow_controller_spec.rb | ||
| remote_interaction_controller_spec.rb | ||
| shares_controller_spec.rb | ||
| statuses_cleanup_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| tags_controller_spec.rb | ||