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`. |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
announcements | ||
apps | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
trends | ||
accounts_controller_spec.rb | ||
announcements_controller_spec.rb | ||
apps_controller_spec.rb | ||
blocks_controller_spec.rb | ||
bookmarks_controller_spec.rb | ||
conversations_controller_spec.rb | ||
custom_emojis_controller_spec.rb | ||
domain_blocks_controller_spec.rb | ||
endorsements_controller_spec.rb | ||
favourites_controller_spec.rb | ||
filters_controller_spec.rb | ||
follow_requests_controller_spec.rb | ||
instances_controller_spec.rb | ||
lists_controller_spec.rb | ||
markers_controller_spec.rb | ||
media_controller_spec.rb | ||
mutes_controller_spec.rb | ||
notifications_controller_spec.rb | ||
polls_controller_spec.rb | ||
reports_controller_spec.rb | ||
statuses_controller_spec.rb | ||
streaming_controller_spec.rb | ||
suggestions_controller_spec.rb |