mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 23:37:54 +00: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 |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
form | ||
web | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_moderation_note_spec.rb | ||
account_spec.rb | ||
backup_spec.rb | ||
block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_spec.rb | ||
custom_filter_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
export_spec.rb | ||
favourite_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
home_feed_spec.rb | ||
identity_spec.rb | ||
import_spec.rb | ||
invite_spec.rb | ||
list_account_spec.rb | ||
list_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
preview_card_spec.rb | ||
relay_spec.rb | ||
remote_follow_spec.rb | ||
remote_profile_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
stream_entry_spec.rb | ||
subscription_spec.rb | ||
tag_spec.rb | ||
user_spec.rb |