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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		6 years ago
..
activitypub	Add ActivityPub actor representing the entire server (#11321)	6 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	6 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	6 years ago
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	Use a redis-cached feed for the DM timeline	6 years ago
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	Change language detection to include hashtags as words (#11341)	6 years ago
potential_friendship_tracker.rb	…
proof_provider.rb	…
request.rb	Add HTTP signatures to all outgoing ActivityPub GET requests (#11284)	6 years ago
request_pool.rb	Add request pool to improve delivery performance (#10353)	6 years ago
rss_builder.rb	…
sanitize_config.rb	Fix sanitizing lists contents (#11354)	6 years ago
sidekiq_error_handler.rb	Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)	6 years ago
spam_check.rb	Add setting to disable the anti-spam (#11296)	6 years ago
status_filter.rb	…
status_finder.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
tag_manager.rb	Refactor domain block checks (#11268)	6 years ago
themes.rb	…
user_settings_decorator.rb	Add option to disable real-time updates in web UI (#9984)	6 years ago
webfinger_resource.rb	Add ActivityPub actor representing the entire server (#11321)	6 years ago