Merge branch 'main' into jbl/1020721-preserve_order_in_attachmentsdir…

…ectory
ZEISS · Oct 19, 2023 · 9db4052 · 9db4052
2 parents 861ad2a + 3581f6b
commit 9db4052
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
@@ -29,7 +29,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter/flavors/dotnet@v6
+        uses: oxsecurity/megalinter/flavors/dotnet@v7
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 # Contributor Covenant Code of Conduct
 
-This Code of Conduct complements the [ZEISS Social Media Netiquette](https://www.zeiss.com/corporate/int/legal-information/netiquette.html).
+This Code of Conduct complements the [ZEISS Social Media Netiquette](https://www.zeiss.com/corporate/en/legal-information/netiquette.html).
 
 ## Our Pledge
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,8 +1,8 @@
 # Security Policy
 
-Any security issues should be submitted directly to github.microscopy@zeiss.com. In order to determine whether you are dealing with a security issue, ask yourself these two questions:
+Any security issues should be submitted directly through [privately reporting a security vulnerability](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability). In order to determine whether you are dealing with a security issue, ask yourself these two questions:
 
 Can I access something that's not mine, or something I shouldn't have access to?  
 Can I disable something for other people?  
 
-If the answer to either of those two questions are "yes", then you're probably dealing with a security issue. Note that even if you answer "no" to both questions, you may still be dealing with a security issue, so if you're unsure, just email us.
+If the answer to either of those two questions are "yes", then you're probably dealing with a security issue. Note that even if you answer "no" to both questions, you may still be dealing with a security issue, so if you're unsure, just follow the instructions linked above.