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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
activitypub	Fix possible race condition when processing statuses (#10815)	6 years ago
ostatus	…
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	…
formatter.rb	Do not share a single Redcarpet::Markdown object across threads	6 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	…
proof_provider.rb	…
request.rb	…
rss_builder.rb	…
sanitize_config.rb	Allow rel=tag in status text	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	…