mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 00:56:52 +00: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 | ||
| connection_pool | ||
| nodeinfo | ||
| ostatus | ||
| rss | ||
| settings | ||
| access_token_extension.rb | ||
| account_reach_finder.rb | ||
| activity_tracker.rb | ||
| application_extension.rb | ||
| cache_buster.rb | ||
| delivery_failure_tracker.rb | ||
| entity_cache.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| fast_ip_map.rb | ||
| feed_manager.rb | ||
| formatter.rb | ||
| hash_object.rb | ||
| inline_renderer.rb | ||
| link_details_extractor.rb | ||
| permalink_redirector.rb | ||
| potential_friendship_tracker.rb | ||
| rate_limiter.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| rss_builder.rb | ||
| scope_parser.rb | ||
| scope_transformer.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| status_reach_finder.rb | ||
| tag_manager.rb | ||
| themes.rb | ||
| toc_generator.rb | ||
| user_settings_decorator.rb | ||
| validation_error_formatter.rb | ||
| video_metadata_extractor.rb | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||