Skip to content

Commit beb0404

Browse files
authored
Merge branch 'main' into user-review-requested
2 parents ad8f375 + e170b00 commit beb0404

17 files changed

+3162
-1175
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
**/src/extension/vscode.proposed.d.ts
1+
**/src/*/vscode.d.ts
2+
**/src/*/vscode.proposed*.d.ts
23
**/out/
34
**/dist/

.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@
1818
"[typescriptreact]": {
1919
"editor.defaultFormatter": "vscode.typescript-language-features",
2020
},
21-
"editor.insertSpaces": false
21+
"editor.insertSpaces": false,
22+
"git.branchProtection": [
23+
"main",
24+
],
25+
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
26+
"git.branchRandomName.enable": true,
2227
}

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ resources:
1818
extends:
1919
template: azure-pipelines/extension/stable.yml@templates
2020
parameters:
21+
# Once localization supports notebook renderers we can include that folder here
22+
l10nSourcePaths: ./src/extension
2123
buildSteps:
2224
- bash: |
2325
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &

0 commit comments

Comments
 (0)