From b449107411f96dcf7c75a2577695f1fa5c22f071 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Fri, 26 Aug 2022 12:25:31 +0200 Subject: [PATCH] Merge pull request #9415 from overleaf/msm-ce-sp-hotfix-3_2_1 [CE/SP] Hotfix 3.2.1 GitOrigin-RevId: d1c89f40b00e0d648e7f8d76083605cb29aca59e --- server-ce/hotfix/3.2.1/Dockerfile | 6 ++++++ server-ce/hotfix/3.2.1/disable-codemirror.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 server-ce/hotfix/3.2.1/Dockerfile create mode 100644 server-ce/hotfix/3.2.1/disable-codemirror.patch diff --git a/server-ce/hotfix/3.2.1/Dockerfile b/server-ce/hotfix/3.2.1/Dockerfile new file mode 100644 index 0000000000..766eefa771 --- /dev/null +++ b/server-ce/hotfix/3.2.1/Dockerfile @@ -0,0 +1,6 @@ +FROM sharelatex/sharelatex:3.2.0 + +# Patch: fixes source editor broken +# https://github.com/overleaf/overleaf/issues/1043 +COPY disable-codemirror.patch . +RUN patch -p0 < disable-codemirror.patch diff --git a/server-ce/hotfix/3.2.1/disable-codemirror.patch b/server-ce/hotfix/3.2.1/disable-codemirror.patch new file mode 100644 index 0000000000..139fa90c73 --- /dev/null +++ b/server-ce/hotfix/3.2.1/disable-codemirror.patch @@ -0,0 +1,15 @@ +--- services/web/app/src/Features/Project/ProjectController.js +--- services/web/app/src/Features/Project/ProjectController.js +@@ -1134,11 +1134,7 @@ const ProjectController = { + detachRole = req.params.detachRole + } + +- const showNewSourceEditorOption = +- (newSourceEditorAssignment && +- newSourceEditorAssignment.variant === 'codemirror') || +- user.betaProgram || +- shouldDisplayFeature('new_source_editor', false) // also allow override via ?new_source_editor=true ++ const showNewSourceEditorOption = false // disabled in CE/SP (Hotfix 3.2.1) + + const showSymbolPalette = + !Features.hasFeature('saas') ||