Skip to content

chore: remove file ext. from LICENSE #5070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 7, 2022
Merged

chore: remove file ext. from LICENSE #5070

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c184c51
chore: remove file ext. from LICENSE
jsjoeio Apr 6, 2022
baa47b6
fixup!: update LICENSE in missing places
jsjoeio Apr 6, 2022
0c003d5
Revert "fixup!: update LICENSE in missing places"
jsjoeio Apr 7, 2022
b996c32
fixup!: update LICENSE in build-release
jsjoeio Apr 7, 2022
81d3a36
Merge branch 'main' into jsjoeio/fix-license
jsjoeio Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 LICENSE.txt → LICENSE
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ci/build/build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ main() {
bundle_vscode

rsync ./docs/README.md "$RELEASE_PATH"
rsync LICENSE.txt "$RELEASE_PATH"
rsync LICENSE "$RELEASE_PATH"
rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
}

Expand Down Expand Up @@ -113,7 +113,7 @@ bundle_vscode() {
"applicationName": "code-server",
"dataFolderName": ".code-server",
"win32MutexName": "codeserver",
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE.txt",
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE",
"win32DirName": "code-server",
"win32NameVersion": "code-server",
"win32AppUserModelId": "coder.code-server",
Expand Down
2 changes: 1 addition & 1 deletion patches/display-language.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/localizations/browser/lo
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Coder Technologies. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Licensed under the MIT License. See LICENSE in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
Expand Down
2 changes: 1 addition & 1 deletion patches/store-socket.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
+++ code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -2,7 +2,9 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-
+import { promises as fs } from 'fs';
Expand Down