Merge branch 'main' into koda/ticket-create-notification-action

# Conflicts: # resources/js/pages/projects/settings/Notifications.vue
2026-04-25 20:35:38 +02:00
parent 5f74ddd964 cce21fff84
commit 20f89952e7
11 changed files with 372 additions and 124 deletions
@@ -2,6 +2,7 @@

 namespace App\Actions\Notifications;

+use App\Enums\DiscordAllowedMentionType;
 use App\Enums\NotificationChannel;
 use App\Enums\NotificationEventType;
 use App\Http\Resources\NotificationActionResource;
@@ -22,6 +23,7 @@ class BuildProjectNotificationSettingsPayload
        return [
            'channelOptions' => NotificationChannel::options(),
            'eventTypeOptions' => NotificationEventType::options(),
+            'discordAllowedMentionOptions' => DiscordAllowedMentionType::options(),
            'notificationActions' => NotificationActionResource::collection(
                $this->listProjectNotificationActions->handle($project),
            )->resolve(),