mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-26 18:44:13 +00:00
a7aedebc31
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account_alias_spec.rb | ||
| account_conversation_spec.rb | ||
| account_deletion_request_spec.rb | ||
| account_domain_block_spec.rb | ||
| account_filter_spec.rb | ||
| account_migration_spec.rb | ||
| account_moderation_note_spec.rb | ||
| account_spec.rb | ||
| account_stat_spec.rb | ||
| account_tag_stat_spec.rb | ||
| announcement_mute_spec.rb | ||
| announcement_reaction_spec.rb | ||
| announcement_spec.rb | ||
| backup_spec.rb | ||
| block_spec.rb | ||
| conversation_mute_spec.rb | ||
| conversation_spec.rb | ||
| custom_emoji_category_spec.rb | ||
| custom_emoji_filter_spec.rb | ||
| custom_emoji_spec.rb | ||
| custom_filter_spec.rb | ||
| device_spec.rb | ||
| domain_allow_spec.rb | ||
| domain_block_spec.rb | ||
| email_domain_block_spec.rb | ||
| encrypted_message_spec.rb | ||
| export_spec.rb | ||
| favourite_spec.rb | ||
| featured_tag_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 | ||
| marker_spec.rb | ||
| media_attachment_spec.rb | ||
| mention_spec.rb | ||
| mute_spec.rb | ||
| notification_spec.rb | ||
| one_time_key_spec.rb | ||
| poll_spec.rb | ||
| poll_vote_spec.rb | ||
| preview_card_spec.rb | ||
| public_feed_spec.rb | ||
| relationship_filter_spec.rb | ||
| relay_spec.rb | ||
| remote_follow_spec.rb | ||
| report_filter_spec.rb | ||
| report_spec.rb | ||
| scheduled_status_spec.rb | ||
| session_activation_spec.rb | ||
| setting_spec.rb | ||
| site_upload_spec.rb | ||
| status_pin_spec.rb | ||
| status_spec.rb | ||
| status_stat_spec.rb | ||
| system_key_spec.rb | ||
| tag_feed_spec.rb | ||
| tag_spec.rb | ||
| trending_tags_spec.rb | ||
| unavailable_domain_spec.rb | ||
| user_invite_request_spec.rb | ||
| user_spec.rb | ||
| webauthn_credentials_spec.rb | ||