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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
activitypub	Change silences to always require approval on follow (#11975)	5 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	6 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	7 years ago
extractor_spec.rb	Spec Extractor (#3540)	8 years ago
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
formatter_spec.rb	Play animated custom emoji on hover (#11348)	6 years ago
hash_object_spec.rb	Spec HashObject (#3544)	8 years ago
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	6 years ago
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	6 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
sanitize_config_spec.rb	Fix sanitizer text case for glitch-soc, which preserves lists	6 years ago
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	5 years ago
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	7 years ago
webfinger_resource_spec.rb	Fix randomly fail (regression from #3560) (#3580)	8 years ago