From 6480989524a1d6841de73c2aeb51198ba574b99e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Mon, 25 Sep 2023 11:17:37 +0200
Subject: [PATCH] assets/org.yml: handle linearize history

Adds:

- `prod` branch
- `merge_group` trigger
---
 assets/org.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/org.yml b/assets/org.yml
index d9a6cafd..57103142 100644
--- a/assets/org.yml
+++ b/assets/org.yml
@@ -2,10 +2,11 @@ name: security
 on:
   workflow_dispatch:
   push:
-    branches: [main, master, staging, development, devel, dev]
+    branches: [main, master, staging, development, devel, dev, prod]
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     branches: [main, master, staging, development, devel, dev]
+  merge_group:
 permissions:
   contents: read
   pull-requests: write
@@ -22,4 +23,4 @@ jobs:
       - uses: brave/security-action@main
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_token: ${{ secrets.HOTSPOTS_SLACK_TOKEN }}
\ No newline at end of file
+          slack_token: ${{ secrets.HOTSPOTS_SLACK_TOKEN }}