treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/controllers/admin
History
Claire 20fb459dee Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 		2022-11-06 09:50:41 +01:00
..
disputes Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
settings Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +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 Fix admin action logs page (#19649) 2022-11-03 16:06:42 +01: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 Fix tests 2022-07-05 13:17:57 +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 Fix tests 2022-07-05 13:17:57 +02:00
export_domain_blocks_controller_spec.rb Fix tests 2022-07-05 13:17:57 +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
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