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 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		7 years ago
..
activitypub	Fix #6657 - Use target instead of origin in Remove activity (#6664)	7 years ago
ostatus	Introduce OStatus::TagManager (#5008)	7 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 remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
formatter_spec.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	7 years ago
hash_object_spec.rb	Spec HashObject (#3544)	8 years ago
language_detector_spec.rb	Fix filterable_languages method of SettingsHelper (#4966)	7 years ago
provider_discovery_spec.rb	A minor change for ProviderDiscovery and spec (#3543)	8 years ago
request_spec.rb	Validate HTTP response length while receiving (#6891)	7 years ago
status_filter_spec.rb	Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)	8 years ago
status_finder_spec.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
tag_manager_spec.rb	Introduce OStatus::TagManager (#5008)	7 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