Merge remote-tracking branch 'origin/master' into fix/macos-present-r…

…atio
sircharlo · Nov 13, 2024 · e44b8a5 · e44b8a5
2 parents a9d969f + 2352161
commit e44b8a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -15,8 +15,13 @@ javascript:
   - changed-files:
       - any-glob-to-any-file: ['yarn.lock']
 translations:
-  - changed-files:
-      - any-glob-to-any-file:
-          ['docs/locales/**/*', 'docs/src/**/*', 'src/i18n/**/*']
-      - all-globs-to-all-files:
-          ['!docs/locales/en.json', '!docs/src/en/**/*', '!src/i18n/en.json']
+  - all:
+      - changed-files:
+          - any-glob-to-any-file:
+              ['docs/locales/**/*', 'docs/src/**/*', 'src/i18n/**/*']
+          - all-globs-to-all-files:
+              [
+                '!docs/locales/en.json',
+                '!docs/src/en/**/*',
+                '!src/i18n/en.json',
+              ]
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -223,7 +223,8 @@
     "enableKeyboardShortcuts"
   ],
   "yaml.schemas": {
-    "https://json.schemastore.org/github-issue-config.json": "file:///c%3A/Users/manoa/Documents/dev/external/meeting-media-manager/.github/ISSUE_TEMPLATE/config.yml"
+    "https://json.schemastore.org/github-issue-config.json": "file:///c%3A/Users/manoa/Documents/dev/external/meeting-media-manager/.github/ISSUE_TEMPLATE/config.yml",
+    "https://json.schemastore.org/pull-request-labeler-5.json": "file:///c%3A/Users/manoa/Documents/dev/external/meeting-media-manager/.github/labeler.yml"
   },
   "[xml]": {
     "editor.defaultFormatter": "redhat.vscode-xml"