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.
mastodon/spec/controllers/admin
Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream
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
..
disputes Add customizable user roles (#18641) 3 years ago
users Add customizable user roles (#18641) 3 years ago
account_moderation_notes_controller_spec.rb Add customizable user roles (#18641) 3 years ago
accounts_controller_spec.rb Add customizable user roles (#18641) 3 years ago
action_logs_controller_spec.rb Add customizable user roles (#18641) 3 years ago
base_controller_spec.rb Add customizable user roles (#18641) 3 years ago
change_email_controller_spec.rb Add customizable user roles (#18641) 3 years ago
confirmations_controller_spec.rb Add customizable user roles (#18641) 3 years ago
custom_emojis_controller_spec.rb Add customizable user roles (#18641) 3 years ago
dashboard_controller_spec.rb Add customizable user roles (#18641) 3 years ago
domain_allows_controller_spec.rb
domain_blocks_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
email_domain_blocks_controller_spec.rb Add customizable user roles (#18641) 3 years ago
export_domain_allows_controller_spec.rb
export_domain_blocks_controller_spec.rb
instances_controller_spec.rb Add customizable user roles (#18641) 3 years ago
invites_controller_spec.rb Add customizable user roles (#18641) 3 years ago
report_notes_controller_spec.rb Add customizable user roles (#18641) 3 years ago
reports_controller_spec.rb Add customizable user roles (#18641) 3 years ago
resets_controller_spec.rb Add customizable user roles (#18641) 3 years ago
roles_controller_spec.rb Add customizable user roles (#18641) 3 years ago
settings_controller_spec.rb Add customizable user roles (#18641) 3 years ago
statuses_controller_spec.rb Add customizable user roles (#18641) 3 years ago
tags_controller_spec.rb Add customizable user roles (#18641) 3 years ago