Set flavors-stats.json as a generated file in .gitattributes (#3023)

* Set flavors-stats.json as a generated file in .gitattributes Black generated exclusion is removed as it isn't needed anymore * Update CHANGELOG.md * Update .trivyignore --------- Co-authored-by: Nicolas Vuillamy <[email protected]>
oxsecurity · Oct 20, 2023 · b74e24b · b74e24b
1 parent ab7e69c
commit b74e24b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,8 +2,7 @@
 *.{cmd,[cC][mM][dD]} text eol=crlf
 *.{bat,[bB][aA][tT]} text eol=crlf
 
-.automation/generated/flavor-stats.json linguist-generated=true
+.automation/generated/flavors-stats.json linguist-generated=true
 .automation/generated/linter-helps.json linguist-generated=true
-docs/descriptors/python_black.md linguist-generated=true
 docs/descriptors/repository_checkov.md linguist-generated=true
 docs/descriptors/terraform_checkov.md linguist-generated=true
diff --git a/.trivyignore b/.trivyignore
@@ -178,6 +178,7 @@ CVE-2023-32309
 CVE-2023-32314
 CVE-2023-33170
 CVE-2023-34104
+CVE-2023-36414
 CVE-2023-36665
 CVE-2023-4759
 CVE-2023-45133

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
 - CI
   - Add the other maintainers globally to the CODEOWNERS file ([#3008](https://github.com/oxsecurity/megalinter/pull/3008))
   - Free disk space earlier in the process to avoid failure during docker build
+  - Set flavors-stats.json as a generated file in .gitattributes ([#3023](https://github.com/oxsecurity/megalinter/pull/3023))
 
 - Linter versions upgrades
   - [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 0.80.2 to **0.80.3** on 2023-09-24