Skip to content

Commit 3b5d7d0

Browse files
chore: Align index-no-csp.html with upstream
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 9915b05 commit 3b5d7d0

4 files changed

Lines changed: 0 additions & 23 deletions

File tree

.rebase/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ https://github.com/che-incubator/che-code/commit/eed0a5213ba1b29b810d53f6365aaa2
205205
#### @vitaliy-guliy
206206
https://github.com/che-incubator/che-code/pull/211
207207

208-
- code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
209208
- code/src/vs/workbench/contrib/webview/browser/pre/index.html
210209
---
211210

.rebase/replace/code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html

Whitespace-only changes.

rebase.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -349,20 +349,6 @@ apply_code_vs_workbench_contrib_webview_browser_pre_index_html_changes() {
349349
git add code/src/vs/workbench/contrib/webview/browser/pre/index.html > /dev/null 2>&1
350350
}
351351

352-
# Apply changes on code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html file
353-
apply_code_vs_workbench_contrib_webview_browser_pre_index_no_csp_html_changes() {
354-
355-
echo " ⚙️ reworking code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html..."
356-
# reset the file from what is upstream
357-
git checkout --theirs code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html > /dev/null 2>&1
358-
359-
# now apply again the changes
360-
apply_replace code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
361-
362-
# resolve the change
363-
git add code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html > /dev/null 2>&1
364-
}
365-
366352
# Apply changes on code/src/vs/code/browser/workbench/workbench.ts file
367353
apply_code_src_vs_code_browser_workbench_workbench_changes() {
368354

@@ -450,8 +436,6 @@ resolve_conflicts() {
450436
apply_code_vs_workbench_contrib_remote_browser_remote_changes
451437
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/webview/browser/pre/index.html" ]]; then
452438
apply_code_vs_workbench_contrib_webview_browser_pre_index_html_changes
453-
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html" ]]; then
454-
apply_code_vs_workbench_contrib_webview_browser_pre_index_no_csp_html_changes
455439
elif [[ "$conflictingFile" == "code/src/vs/code/browser/workbench/workbench.ts" ]]; then
456440
apply_code_src_vs_code_browser_workbench_workbench_changes
457441
elif [[ "$conflictingFile" == "code/extensions/git/src/ssh-askpass.sh" ]]; then

0 commit comments

Comments
 (0)