From ac3b4e3065af5d464fa23b12efe331096d09108a Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 8 Jul 2022 13:23:46 -0400 Subject: [PATCH] fix: apply LTI 1.3 XBlock patch fix 3.4.7 over nutmeg.1 The actual merge of this into open-release/nutmeg.master is here: https://github.com/openedx/edx-platform/pull/30716 --- CHANGELOG.md | 1 + tutor/templates/build/openedx/Dockerfile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 089719d..181a3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Every user-facing change should have an entry in this changelog. Please respect --> ## Unreleased +- [Bugfix] Patch nutmeg.1 release with [LTI 1.3 fix](https://github.com/openedx/edx-platform/pull/30716). (by @ormsbee) - [Improvement] Make it possible to override k8s resources in plugins using `k8s-override` patch. (by @foadlind) ## v14.0.2 (2022-06-27) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 628927e..99e1d2a 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -53,6 +53,9 @@ RUN curl -fsSL https://github.com/open-craft/edx-platform/commit/3d54f284f82b61e # fix: add () to print statement so problem with hint template works in newer versions # https://github.com/openedx/edx-platform/pull/30585 RUN curl -fsSL https://github.com/openedx/edx-platform/commit/468036b3085adbe77a2dbb4a1c3bd88ab831f7b0.patch | git am +# Fix LTI 1.3 Names & Roles and Grades conflict with DarkLangMiddleware +# https://github.com/openedx/edx-platform/pull/30716 +RUN curl -fsSL https://github.com/openedx/edx-platform/commit/531bc54833dc97244b408f9f443d2b036f474f0d.patch | git am {%- endif %} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ | git am #}