Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
93bdb168170504e93f42d6b52bd2999ea17f48c2
mastodon/app/controllers/admin
History
Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
..
announcements
Add ability to email announcements to all users (#33928)
2025-03-06 14:05:27 +00:00
disputes
Use async_count in more view locations (#32086)
2024-10-04 12:29:43 +00:00
fasp
Basic FASP support (#34031)
2025-03-28 12:16:40 +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
terms_of_service
Add effective date to terms of service (#33993)
2025-03-05 09:01:33 +00:00
trends
Limit count to pending&trending on admin/trends/tags page (#35120)
2025-06-23 13:30:12 +00:00
users
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
webhooks
Add administrative webhooks (#18510)
2022-06-09 21:57:36 +02:00
account_actions_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
account_moderation_notes_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
accounts_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
action_logs_controller.rb
Add Account.auditable scope, fix N+1 in admin/action_logs#index (#28812)
2024-01-19 01:39:30 +00:00
announcements_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
base_controller.rb
Remove duplicate cache header setting before action (#33833)
2025-02-05 09:19:08 +00:00
change_emails_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
confirmations_controller.rb
Fix Style/GuardClause cop in app/controllers (#28420)
2024-01-25 15:13:41 +00:00
custom_emojis_controller.rb
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
2025-01-27 18:19:09 +01:00
dashboard_controller.rb
Use async count in admin dashboard (#30606)
2024-09-06 16:52:35 +00:00
domain_allows_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
domain_blocks_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
email_domain_blocks_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00: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
Add specs for Instance model scopes and add with_domain_follows scope (#28767)
2024-01-25 15:28:27 +00:00
follow_recommendations_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
instances_controller.rb
Extract constants for controller LIMIT queries (#32921)
2024-11-18 09:23:38 +00:00
invites_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
ip_blocks_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
relationships_controller.rb
Add customizable user roles (#18641)
2022-07-05 02:41:40 +02:00
relays_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
report_notes_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
reports_controller.rb
Fix sort order of moderation notes on Reports and Accounts (#31528)
2024-09-06 14:58:36 +00:00
resets_controller.rb
Add ability to skip sign-in token authentication for specific users (#16427)
2021-07-08 05:31:28 +02:00
roles_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
rules_controller.rb
Add ability to translate server rules (#34494)
2025-05-21 11:54:12 +00:00
settings_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
site_uploads_controller.rb
Redirect back after site upload deletion (#30141)
2024-05-06 13:31:39 +00:00
software_updates_controller.rb
Fix Mastodon listing updates older or equal to current version (#33906)
2025-02-12 14:27:42 +00:00
statuses_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
tags_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
terms_of_service_controller.rb
Add effective date to terms of service (#33993)
2025-03-05 09:01:33 +00:00
warning_presets_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00
webhooks_controller.rb
Use expect for admin/ controllers (#33686)
2025-01-27 14:05:16 +00:00