mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| connection_pool | ||
| importer | ||
| nodeinfo | ||
| ostatus | ||
| rss | ||
| settings | ||
| translation_service | ||
| vacuum | ||
| access_token_extension.rb | ||
| account_reach_finder.rb | ||
| activity_tracker.rb | ||
| advanced_text_formatter.rb | ||
| application_extension.rb | ||
| ascii_folding.rb | ||
| cache_buster.rb | ||
| delivery_failure_tracker.rb | ||
| emoji_formatter.rb | ||
| entity_cache.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| fast_ip_map.rb | ||
| feed_manager.rb | ||
| hash_object.rb | ||
| hashtag_normalizer.rb | ||
| html_aware_formatter.rb | ||
| inline_renderer.rb | ||
| link_details_extractor.rb | ||
| permalink_redirector.rb | ||
| plain_text_formatter.rb | ||
| potential_friendship_tracker.rb | ||
| rate_limiter.rb | ||
| redis_configuration.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| scope_parser.rb | ||
| scope_transformer.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| status_cache_hydrator.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| status_reach_finder.rb | ||
| suspicious_sign_in_detector.rb | ||
| tag_manager.rb | ||
| text_formatter.rb | ||
| themes.rb | ||
| translation_service.rb | ||
| user_settings_serializer.rb | ||
| vacuum.rb | ||
| validation_error_formatter.rb | ||
| video_metadata_extractor.rb | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||