Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
activitypub	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	2018-05-18 11:33:56 +02:00
ostatus	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
formatter_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
hash_object_spec.rb
language_detector_spec.rb
request_spec.rb	Validate HTTP response length while receiving (#6891)	2018-03-26 14:02:10 +02:00
status_filter_spec.rb
status_finder_spec.rb	Add tests for embeds controller (#7719)	2018-06-04 10:35:56 +09:00
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +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