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	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	Conditional validations no longer accept strings for if/unless (#3124)	8 years ago
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	7 years ago
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	7 years ago
extractor.rb	Using double splat operator (#5859)	7 years ago
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	7 years ago
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	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	8 years ago
inline_renderer.rb	Add conversations API (#8832)	6 years ago
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	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	Allow rel=tag in status text	6 years ago
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	7 years ago
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
tag_manager.rb	Introduce OStatus::TagManager (#5008)	7 years ago
themes.rb	Allow selecting both default flavour and theme	6 years ago
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webfinger_resource.rb	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)	8 years ago