Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
activitypub	Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)	2019-01-02 01:12:02 +01:00
ostatus	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Add specs for list replies policy	2018-11-28 14:46:07 +01:00
formatter_spec.rb	Bump sanitize from 4.6.6 to 5.0.0 (#9140)	2018-10-29 14:05:25 +01:00
hash_object_spec.rb
language_detector_spec.rb	Leave unknown language as nil if account is remote (#8861)	2018-10-05 19:17:46 +02:00
request_spec.rb	Fix connect timeout not being enforced (#9329)	2018-11-22 20:12:04 +01: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