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.

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		6 years ago
..
activitypub	…
ostatus	…
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Migrate glitch-soc keyword mutes to Mastodon's	6 years ago
formatter_spec.rb	…
hash_object_spec.rb	…
language_detector_spec.rb	…
request_spec.rb	…
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	…
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…