Merge branch 'contrib/wolyslager_update-incident-occurred-time' into …

…update-incident-occurred-time
demisto · Dec 14, 2023 · 7b13be4 · 7b13be4
2 parents 486382f + e922246
commit 7b13be4
Show file tree

Hide file tree

Showing 462 changed files with 12,291 additions and 4,958 deletions.
diff --git a/.github/workflows/close_jira_issue_by_pr_merge.yml b/.github/workflows/close_jira_issue_by_pr_merge.yml
@@ -9,7 +9,7 @@ permissions:
 jobs:
   add_pr_link_to_related_jira_issue:
     runs-on: ubuntu-latest
-    if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' && github.event.action == 'closed' && github.event.pull_request.merged == true 
+    if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'contrib/') == false
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/link_edited_pr_to_jira_issue.yml b/.github/workflows/link_edited_pr_to_jira_issue.yml
@@ -9,7 +9,7 @@ permissions:
 jobs:
   add_pr_link_to_related_jira_issue:
     runs-on: ubuntu-latest
-    if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]'
+    if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' && startsWith(github.head_ref, 'contrib/') == false
     steps:
       - name: Checkout
         uses: actions/checkout@v4