mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 16:05:04 +00:00
9abb227250
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| connection_pool | ||
| nodeinfo | ||
| ostatus | ||
| proof_provider | ||
| settings | ||
| activity_tracker.rb | ||
| application_extension.rb | ||
| delivery_failure_tracker.rb | ||
| entity_cache.rb | ||
| exceptions.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| feed_manager.rb | ||
| formatter.rb | ||
| hash_object.rb | ||
| inline_renderer.rb | ||
| language_detector.rb | ||
| potential_friendship_tracker.rb | ||
| proof_provider.rb | ||
| rate_limiter.rb | ||
| request.rb | ||
| request_pool.rb | ||
| rss_builder.rb | ||
| sanitize_config.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| sidekiq_error_handler.rb | ||
| spam_check.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| tag_manager.rb | ||
| themes.rb | ||
| toc_generator.rb | ||
| user_settings_decorator.rb | ||
| webfinger_resource.rb | ||