mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-27 23:55:52 +00:00
980c004f06
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one |
||
|---|---|---|
| .. | ||
| 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 | ||
| 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 | ||