mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
e2a2bc9021
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| connection_pool | ||
| nodeinfo | ||
| ostatus | ||
| proof_provider | ||
| 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 | ||
| language_detector.rb | ||
| potential_friendship_tracker.rb | ||
| proof_provider.rb | ||
| rate_limiter.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| rss_builder.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| sidekiq_error_handler.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 | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||