mirror of https://github.com/mastodon/mastodon
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
92c06a1113
Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line. |
3 years ago | |
|---|---|---|
| .. | ||
| admin | 3 years ago | |
| concerns | 3 years ago | |
| trends | 3 years ago | |
| web | 3 years ago | |
| account_alias_spec.rb | 5 years ago | |
| account_conversation_spec.rb | ||
| account_deletion_request_spec.rb | 4 years ago | |
| account_domain_block_spec.rb | ||
| account_filter_spec.rb | 3 years ago | |
| account_migration_spec.rb | 5 years ago | |
| account_moderation_note_spec.rb | ||
| account_spec.rb | 3 years ago | |
| account_statuses_cleanup_policy_spec.rb | 3 years ago | |
| account_statuses_filter_spec.rb | 3 years ago | |
| announcement_mute_spec.rb | 5 years ago | |
| announcement_reaction_spec.rb | 5 years ago | |
| announcement_spec.rb | 5 years ago | |
| appeal_spec.rb | 3 years ago | |
| backup_spec.rb | ||
| block_spec.rb | ||
| canonical_email_block_spec.rb | 4 years ago | |
| conversation_mute_spec.rb | ||
| conversation_spec.rb | ||
| custom_emoji_category_spec.rb | ||
| custom_emoji_filter_spec.rb | ||
| custom_emoji_spec.rb | ||
| custom_filter_keyword_spec.rb | 3 years ago | |
| custom_filter_spec.rb | ||
| device_spec.rb | 5 years ago | |
| domain_allow_spec.rb | ||
| domain_block_spec.rb | 5 years ago | |
| email_domain_block_spec.rb | 3 years ago | |
| encrypted_message_spec.rb | 5 years ago | |
| export_spec.rb | ||
| favourite_spec.rb | ||
| featured_tag_spec.rb | ||
| follow_recommendation_suppression_spec.rb | 4 years ago | |
| follow_request_spec.rb | 4 years ago | |
| follow_spec.rb | 4 years ago | |
| home_feed_spec.rb | 3 years ago | |
| identity_spec.rb | ||
| import_spec.rb | 4 years ago | |
| invite_spec.rb | 4 years ago | |
| ip_block_spec.rb | 4 years ago | |
| list_account_spec.rb | ||
| list_spec.rb | ||
| login_activity_spec.rb | 4 years ago | |
| marker_spec.rb | 5 years ago | |
| media_attachment_spec.rb | 3 years ago | |
| mention_spec.rb | ||
| mute_spec.rb | ||
| notification_spec.rb | 4 years ago | |
| one_time_key_spec.rb | 5 years ago | |
| poll_spec.rb | ||
| poll_vote_spec.rb | ||
| preview_card_spec.rb | ||
| public_feed_spec.rb | 3 years ago | |
| relationship_filter_spec.rb | 5 years ago | |
| relay_spec.rb | ||
| remote_follow_spec.rb | 5 years ago | |
| report_filter_spec.rb | ||
| report_spec.rb | 3 years ago | |
| rule_spec.rb | 4 years ago | |
| scheduled_status_spec.rb | ||
| session_activation_spec.rb | 4 years ago | |
| setting_spec.rb | 4 years ago | |
| site_upload_spec.rb | ||
| status_edit_spec.rb | 3 years ago | |
| status_pin_spec.rb | 3 years ago | |
| status_spec.rb | 3 years ago | |
| status_stat_spec.rb | ||
| system_key_spec.rb | 5 years ago | |
| tag_feed_spec.rb | 4 years ago | |
| tag_spec.rb | 4 years ago | |
| unavailable_domain_spec.rb | 5 years ago | |
| user_invite_request_spec.rb | ||
| user_role_spec.rb | 3 years ago | |
| user_spec.rb | 3 years ago | |
| webauthn_credentials_spec.rb | 4 years ago | |
| webhook_spec.rb | 3 years ago | |