This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2019-06-10 18:59:53 +02:00
..
activitypub	Change priority of delete activity forwards for replies and reblogs (#11002)	2019-06-09 12:47:33 +02:00
ostatus	…
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	2019-04-21 04:53:24 +02:00
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	…
formatter.rb	Do not share a single Redcarpet::Markdown object across threads	2019-05-23 21:19:44 +02:00
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	Change language detector threshold from 140 characters to 4 words (#10376)	2019-03-26 01:23:59 +01:00
potential_friendship_tracker.rb	…
proof_provider.rb	…
request.rb	…
rss_builder.rb	…
sanitize_config.rb	Truncate long URLs while providing alt text for inline images	2019-05-28 19:33:43 +02:00
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	2019-05-26 15:41:40 +02:00
webfinger_resource.rb	…