christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-12 14:17:46 +00:00
Code Issues Releases Activity

Merge branch 'master' into nightly

Browse Source
This commit is contained in:
Régis Behmo 2022-06-16 18:04:03 +02:00
commit c014a05504
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -18,6 +18,8 @@ Every user-facing change should have an entry in this changelog. Please respect
## Unreleased
- [Improvement] Use `git am` instead of `cherry-pick` to simplify patching process.
## v14.0.1 (2022-06-13)
- [Bugfix] Fix missing tables on migration from maple ([#689](https://github.com/overhangio/tutor/issues/689)). (by @ibrmora)

2
docs/dev.rst
View File

@ -9,7 +9,7 @@ In addition to running Open edX in production, Tutor can be used for local devel
First-time setup
----------------
First, ensure you have already `installed Tutor <install.rst>`_ (for development against the named releases of Open edX) or `Tutor Nightly <nightly.rst>`_ (for development against Open edX's master branches).
First, ensure you have already :ref:`installed Tutor <install>` (for development against the named releases of Open edX) or :ref:`Tutor Nightly <nightly>` (for development against Open edX's master branches).
Then, launch the developer platform setup process::

4
tutor/templates/build/openedx/Dockerfile
View File

@ -38,7 +38,7 @@ RUN mkdir -p /openedx/edx-platform && \
git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform
WORKDIR /openedx/edx-platform
# Identify tutor user to cherry-pick commits
# Identify tutor user to apply patches using git
RUN git config --global user.email "tutor@overhang.io" \
&& git config --global user.name "Tutor"
@ -49,7 +49,7 @@ RUN git config --global user.email "tutor@overhang.io" \
# Patch edx-platform
{%- endif %}
{# Example: RUN git fetch --depth=2 https://github.com/openedx/edx-platform <GITSHA1> && git cherry-pick <GITSHA1> #}
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1> | git am #}
{{ patch("openedx-dockerfile-post-git-checkout") }}
###### Download extra locales to /openedx/locale/contrib/locale