FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/admin
History
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
 		2023-02-19 10:42:55 +01:00
..
disputes
…
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
…
webhooks
…
account_actions_controller.rb Add confirmation screen when handling reports (#22375) 2023-01-18 16:40:09 +01:00
account_moderation_notes_controller.rb
…
accounts_controller.rb Log admin approve and reject account (#22088) 2022-12-07 00:25:18 +01:00
action_logs_controller.rb
…
announcements_controller.rb
…
base_controller.rb
…
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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
domain_allows_controller.rb
…
domain_blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
email_domain_blocks_controller.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
export_domain_allows_controller.rb Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
export_domain_blocks_controller.rb Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
follow_recommendations_controller.rb
…
instances_controller.rb Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01: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
…
relays_controller.rb Allow adding relays while secure mode & limited federation mode are enabled (#22324) 2022-12-15 15:56:05 +01:00
report_notes_controller.rb
…
reports_controller.rb
…
resets_controller.rb
…
roles_controller.rb
…
rules_controller.rb
…
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
statuses_controller.rb Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
tags_controller.rb
…
warning_presets_controller.rb
…
webhooks_controller.rb
…