Skip to content

Commit

Permalink
Merge pull request #244 from appsembler/juniper/main
Browse files Browse the repository at this point in the history
Update from `juniper/main` (production)
  • Loading branch information
jfaMan committed Feb 27, 2024
2 parents d596e71 + 1aaf46a commit 7a83712
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 2 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# see: https://appsembler.atlassian.net/wiki/spaces/ED/pages/2227503161/CODEOWNERS

* @grozdanowski

# default set of reviewers
* @grozdanowski @omarithawi @melvinsoft
# Codeowner and additional reviewers
* @jfaMan @daniilly @VladyslavTy
5 changes: 4 additions & 1 deletion .github/workflows/sync_prod_with_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: pull-request-action
uses: vsoch/pull-request-action@1.0.12
uses: vsoch/pull-request-action@1.1.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH_PREFIX: "juniper/main"
PULL_REQUEST_BRANCH: "juniper/prod"
PULL_REQUEST_TITLE: "Update from `juniper/main` (production)"
PULL_REQUEST_BODY: |
This is an automated pull request to update `juniper/prod` with changes from `juniper/main`.
Please review the changes to make sure they're production ready.
2 changes: 1 addition & 1 deletion conf/locale/fr_CA/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ msgstr "Ajouter à votre panier / Prix: "

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

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

0 comments on commit 7a83712

Please sign in to comment.