mirror of
https://github.com/mastodon/mastodon.git
synced 2025-12-06 22:33:43 +00:00
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. |
||
|---|---|---|
| .. | ||
| disputes | ||
| users | ||
| account_moderation_notes_controller_spec.rb | ||
| accounts_controller_spec.rb | ||
| action_logs_controller_spec.rb | ||
| base_controller_spec.rb | ||
| change_email_controller_spec.rb | ||
| confirmations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| dashboard_controller_spec.rb | ||
| domain_allows_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| email_domain_blocks_controller_spec.rb | ||
| export_domain_allows_controller_spec.rb | ||
| export_domain_blocks_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| report_notes_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| resets_controller_spec.rb | ||
| roles_controller_spec.rb | ||
| settings_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| tags_controller_spec.rb | ||