mirror of https://github.com/tootsuite/mastodon
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 |
||
|---|---|---|
| .. | ||
| access_token_fabricator.rb | ||
| accessible_access_token_fabricator.rb | ||
| account_domain_block_fabricator.rb | ||
| account_fabricator.rb | ||
| account_moderation_note_fabricator.rb | ||
| admin_action_log_fabricator.rb | ||
| application_fabricator.rb | ||
| backup_fabricator.rb | ||
| block_fabricator.rb | ||
| bookmark_fabricator.rb | ||
| conversation_fabricator.rb | ||
| conversation_mute_fabricator.rb | ||
| custom_emoji_fabricator.rb | ||
| custom_filter_fabricator.rb | ||
| domain_block_fabricator.rb | ||
| email_domain_block_fabricator.rb | ||
| favourite_fabricator.rb | ||
| follow_fabricator.rb | ||
| follow_request_fabricator.rb | ||
| identity_fabricator.rb | ||
| import_fabricator.rb | ||
| invite_fabricator.rb | ||
| list_account_fabricator.rb | ||
| list_fabricator.rb | ||
| media_attachment_fabricator.rb | ||
| mention_fabricator.rb | ||
| mute_fabricator.rb | ||
| notification_fabricator.rb | ||
| relay_fabricator.rb | ||
| report_fabricator.rb | ||
| report_note_fabricator.rb | ||
| session_activation_fabricator.rb | ||
| setting_fabricator.rb | ||
| site_upload_fabricator.rb | ||
| status_fabricator.rb | ||
| status_pin_fabricator.rb | ||
| stream_entry_fabricator.rb | ||
| subscription_fabricator.rb | ||
| tag_fabricator.rb | ||
| user_fabricator.rb | ||
| web_push_subscription_fabricator.rb | ||
| web_setting_fabricator.rb | ||