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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
activitypub	Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)	6 years ago
ostatus	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
activity_tracker.rb	…
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	…
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	…
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	Add a per-user setting to hide followers count	6 years ago
webfinger_resource.rb	…