mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-06-26 16:53:28 +00:00
Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
82eeca8f57
1
changelog.d/20230728_210255_regis.md
Normal file
1
changelog.d/20230728_210255_regis.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
- [Security] Fix content libraries creation by unprivileged users in studio (see [security advisory](https://github.com/openedx/edx-platform/security/advisories/GHSA-3q74-3rfh-g37j)). (by @regisb)
|
|
@ -50,6 +50,9 @@ RUN git config --global user.email "tutor@overhang.io" \
|
||||||
{{ patch("openedx-dockerfile-git-patches-default") }}
|
{{ patch("openedx-dockerfile-git-patches-default") }}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
# Patch edx-platform
|
# Patch edx-platform
|
||||||
|
# Security advisory: https://github.com/openedx/edx-platform/security/advisories/GHSA-3q74-3rfh-g37j
|
||||||
|
# https://github.com/openedx/edx-platform/pull/32838
|
||||||
|
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/163259779297a7dccb28e1f8c3dfa4d2cbdb9655.patch | git am
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}
|
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user