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.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		7 years ago
..
activitypub	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 years ago
ostatus	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	7 years ago
settings	…
activity_tracker.rb	…
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	7 years ago
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	7 years ago
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
frontmatter_handler.rb	Remove ignored 'u' parameter on regexp (#392)	7 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
request.rb	User agent for WebFinger (#7531)	7 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	…
sidekiq_error_handler.rb	…
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
status_finder.rb	…
tag_manager.rb	…
themes.rb	…
user_settings_decorator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
webfinger_resource.rb	…