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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		6 years ago
..
activitypub	Change priority of delete activity forwards for replies and reblogs (#11002)	6 years ago
ostatus	When serializing polls over OStatus, serialize poll options to text (#10160)	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	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	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter.rb	Do not share a single Redcarpet::Markdown object across threads	6 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	Change language detector threshold from 140 characters to 4 words (#10376)	6 years ago
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	6 years ago
proof_provider.rb	Add Keybase integration (#10297)	6 years ago
request.rb	Increase DNS timeouts (#10238)	6 years ago
rss_builder.rb	…
sanitize_config.rb	Truncate long URLs while providing alt text for inline images	6 years ago
sidekiq_error_handler.rb	…
status_filter.rb	…
status_finder.rb	…
tag_manager.rb	…
themes.rb	…
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webfinger_resource.rb	…