mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 08:25:19 +00:00
dcded13a99
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| ostatus | ||
| 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 | ||
| request.rb | ||
| rss_builder.rb | ||
| sanitize_config.rb | ||
| sidekiq_error_handler.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| tag_manager.rb | ||
| themes.rb | ||
| user_settings_decorator.rb | ||
| webfinger_resource.rb | ||