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.
2022-07-05 09:33:44 +02:00
..
disputes Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
users Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_moderation_notes_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
accounts_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
action_logs_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
base_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
change_email_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
confirmations_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
custom_emojis_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
dashboard_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
domain_allows_controller_spec.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
domain_blocks_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
email_domain_blocks_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
export_domain_allows_controller_spec.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
export_domain_blocks_controller_spec.rb Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
instances_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
invites_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
report_notes_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
reports_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
resets_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
roles_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
settings_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
statuses_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
tags_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00