Merge branch 'develop' into new-feature/2066-file-attribute-character…

…-limit-when-adding-via-admin-pages
luistoptal · Nov 21, 2024 · 68ec746 · 68ec746
2 parents a8fa49d + 80ea4a6
commit 68ec746
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
 
 - Feat #2066: Update file attribute values form layout and add expand button for long values
+- Fix #2094: Make Semgrep-based SAST analyzer available in tagged release
 - Feat #701: Code refactoring to separate upload status transitions and notifications to prepare for upload status overhaul
 - Security #1867: Update the gitlab static application security testing (SAST) job using the Semgrep-based analyzer
 

diff --git a/ops/pipelines/gigadb-conformance-security-jobs.yml b/ops/pipelines/gigadb-conformance-security-jobs.yml
@@ -70,6 +70,8 @@ check_PHPDoc:
 
 semgrep-sast:
   stage: conformance and security
+  rules:
+    - if: $CI_COMMIT_BRANCH || $CI_COMMIT_TAG
 
 variables:
   CS_ANALYZER_IMAGE: "$CI_TEMPLATE_REGISTRY_HOST/security-products/container-scanning:6"