Skip to content

Commit 7a83712

Browse files
authored
Merge pull request #244 from appsembler/juniper/main
Update from `juniper/main` (production)
2 parents d596e71 + 1aaf46a commit 7a83712

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/CODEOWNERS

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# see: https://appsembler.atlassian.net/wiki/spaces/ED/pages/2227503161/CODEOWNERS
22

3-
* @grozdanowski
4-
5-
# default set of reviewers
6-
* @grozdanowski @omarithawi @melvinsoft
3+
# Codeowner and additional reviewers
4+
* @jfaMan @daniilly @VladyslavTy

.github/workflows/sync_prod_with_main.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: pull-request-action
12-
uses: vsoch/pull-request-action@1.0.12
12+
uses: vsoch/pull-request-action@1.1.0
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
BRANCH_PREFIX: "juniper/main"
1616
PULL_REQUEST_BRANCH: "juniper/prod"
1717
PULL_REQUEST_TITLE: "Update from `juniper/main` (production)"
18+
PULL_REQUEST_BODY: |
19+
This is an automated pull request to update `juniper/prod` with changes from `juniper/main`.
20+
Please review the changes to make sure they're production ready.

conf/locale/fr_CA/LC_MESSAGES/django.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ msgstr "Ajouter à votre panier / Prix: "
3333

3434
#: lms/templates/design-templates/pages/course-about/_course-about-01.html:20
3535
msgid "Enroll in "
36-
msgstr "S'inscrire au "
36+
msgstr "S'inscrire au cours "
3737

3838
#: lms/templates/design-templates/pages/dashboard/_dashboard-01.html:140
3939
msgid "promote_course_catalog_text"

0 commit comments

Comments
 (0)