mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-20 00:50:04 +00:00
c1c514ca70
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. |
||
|---|---|---|
| .. | ||
| 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 | ||