Skip to content

Commit b24c843

Browse files
authored
Merge pull request #4270 from learningequality/unstable
Merge unstable to hotfixes
2 parents ba592bd + 1a62ea9 commit b24c843

32 files changed

Lines changed: 510 additions & 235 deletions

File tree

.github/workflows/deploytest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: Use Node.js
3232
uses: actions/setup-node@v3
3333
with:
@@ -51,7 +51,7 @@ jobs:
5151
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
5252
runs-on: ubuntu-latest
5353
steps:
54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555
- name: Set up Python 3.9
5656
uses: actions/setup-python@v4
5757
with:

.github/workflows/frontendlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: Use Node.js
3232
uses: actions/setup-node@v3
3333
with:

.github/workflows/frontendtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: Use Node.js
3232
uses: actions/setup-node@v3
3333
with:

.github/workflows/pythontest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# Maps port 6379 on service container to the host
6262
- 6379:6379
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565
- name: Set up minio
6666
run: |
6767
docker run -d -p 9000:9000 --name minio \

contentcuration/automation/__init__.py

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# from django.contrib import admin
2+
3+
# Register your models here.

contentcuration/automation/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class AutomationConfig(AppConfig):
5+
default_auto_field = 'django.db.models.BigAutoField'
6+
name = 'automation'

contentcuration/automation/migrations/__init__.py

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# from django.db import models
2+
3+
# Create your models here.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# from django.test import TestCase
2+
3+
# Create your tests here.

0 commit comments

Comments
 (0)