Skip to content

Commit fb6ba85

Browse files
Merge remote-tracking branch 'Parent/main' into Current
2 parents 4b7fdd0 + 31620a3 commit fb6ba85

File tree

118 files changed

+2770
-2687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2770
-2687
lines changed

.vscode/notebooks/api.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"May 2025\""
10+
"value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"June 2025\""
1111
},
1212
{
1313
"kind": 1,

build/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@types/workerpool": "^6.4.0",
3737
"@types/xml2js": "0.0.33",
3838
"@vscode/iconv-lite-umd": "0.7.0",
39-
"@vscode/ripgrep": "^1.15.10",
39+
"@vscode/ripgrep": "^1.15.13",
4040
"@vscode/vsce": "2.20.1",
4141
"byline": "^5.0.0",
4242
"debug": "^4.3.2",

extensions/github-authentication/media/index.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@
2323
</div>
2424
</div>
2525
<script>
26-
var search = window.location.search;
27-
var error = (/[?&^]error=([^&]+)/.exec(search) || [])[1];
26+
var urlParams = new URLSearchParams(window.location.search);
27+
var error = urlParams.get('error');
2828
if (error) {
2929
document.querySelector('.error-text')
30-
.textContent = decodeURIComponent(error);
30+
.textContent = error;
3131
document.querySelector('body')
3232
.classList.add('error');
33+
} else if (urlParams.get('redirect_uri')) {
34+
setTimeout(() => {
35+
window.location = urlParams.get('redirect_uri');
36+
}, 1000);
3337
}
3438
</script>
3539
</body>

0 commit comments

Comments
 (0)