Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		2018-07-16 14:50:42 +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	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
feed_manager_spec.rb	Migrate glitch-soc keyword mutes to Mastodon's	2018-07-09 19:19:23 +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	Disable language detection for texts shorter than 140 characters (#8010)	2018-07-14 04:05:36 +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	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	Fix randomly fail (regression from #3560) (#3580)	2017-06-05 10:03:36 +02:00