mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 11:00:26 -05:00
f26f1145ac
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 |
||
---|---|---|
.. | ||
activitypub | ||
ostatus | ||
settings | ||
delivery_failure_tracker_spec.rb | ||
extractor_spec.rb | ||
feed_manager_spec.rb | ||
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 |