You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		6 years ago
..
activitypub	Add logging for rejected ActivityPub payloads and add tests (#10062)	6 years ago
ostatus	Create Redisable#redis (#9633)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
activity_tracker.rb	Create Redisable#redis (#9633)	6 years ago
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	…
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	6 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	6 years ago
request.rb	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	6 years ago
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	Make displaying application used to toot opt-in (#9897)	6 years ago
webfinger_resource.rb	…