treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/controllers/admin
History
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
 		2023-12-20 22:05:31 +01:00
..
disputes Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-27 09:57:16 +00:00
reports Add confirmation screen when handling reports (#22375) 2023-01-18 16:40:09 +01:00
settings Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
trends Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
users Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
account_actions_controller.rb Fix report processing notice not mentioning the report number when performing a custom action (#27442) 2023-10-26 17:03:31 +00:00
account_moderation_notes_controller.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
accounts_controller.rb Log admin approve and reject account (#22088) 2022-12-07 00:25:18 +01:00
action_logs_controller.rb Remove `default_scope` from `Admin::ActionLog` (#28026) 2023-11-29 10:39:59 +00:00
announcements_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
base_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
change_emails_controller.rb
…
confirmations_controller.rb Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674) 2022-11-02 18:50:21 +01:00
custom_emojis_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
dashboard_controller.rb Remove unused `redis_info` method Admin::Dashboard (#25345) 2023-06-09 14:03:35 +02:00
domain_allows_controller.rb
…
domain_blocks_controller.rb Add some more tests and clean up domain block controller (#27469) 2023-10-31 09:40:30 +00:00
email_domain_blocks_controller.rb Remove references to non-existent actions (#24183) 2023-03-20 20:03:44 +01:00
export_domain_allows_controller.rb File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
export_domain_blocks_controller.rb File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
follow_recommendations_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
instances_controller.rb Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
invites_controller.rb
…
ip_blocks_controller.rb Fix IP blocks not having a unique index (#19456) 2022-10-25 21:43:44 +02:00
relationships_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
relays_controller.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
report_notes_controller.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
reports_controller.rb
…
resets_controller.rb
…
roles_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
rules_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
settings_controller.rb Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02:00
site_uploads_controller.rb Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02:00
software_updates_controller.rb Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
statuses_controller.rb Remove `default_scope` from `StatusEdit` class (#28042) 2023-11-23 09:26:11 +00:00
tags_controller.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
warning_presets_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
webhooks_controller.rb Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00