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.		2018-04-08 19:05:02 -05:00
..
activitypub	Fix #6657 - Use target instead of origin in Remove activity (#6664)	2018-03-07 03:54:46 +01:00
ostatus	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
settings	Add a test for Settings::Extend#settings (#5720)	2017-11-19 04:15:32 +01:00
delivery_failure_tracker_spec.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	2017-09-29 03:16:20 +02:00
extractor_spec.rb	Spec Extractor (#3540)	2017-06-04 14:57:02 +02:00
feed_manager_spec.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-24 05:17:10 +00:00
formatter_spec.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	2018-04-01 23:55:42 +02:00
hash_object_spec.rb	Spec HashObject (#3544)	2017-06-04 14:59:52 +02:00
language_detector_spec.rb	Fix filterable_languages method of SettingsHelper (#4966)	2017-09-16 14:59:41 +02:00
provider_discovery_spec.rb	A minor change for ProviderDiscovery and spec (#3543)	2017-06-04 14:59:40 +02:00
request_spec.rb	Validate HTTP response length while receiving (#6891)	2018-03-26 14:02:10 +02:00
status_filter_spec.rb	Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)	2017-06-15 02:00:08 +02:00
status_finder_spec.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
tag_manager_spec.rb	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb	Fix randomly fail (regression from #3560) (#3580)	2017-06-05 10:03:36 +02:00