Skip to content

Commit f4fdae2

Browse files
Merge branch 'master' into master-to-master-design-tokens-sync
Conflicts: src/courseware/course/sidebar/common/SidebarBase.scss src/courseware/course/sidebar/sidebars/course-outline/CourseOutlineTray.scss src/courseware/course/sidebar/sidebars/discussions/Discussions.scss src/index.scss
2 parents c465666 + 7eddc91 commit f4fdae2

38 files changed

+634
-374
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Run the workflow that adds new tickets that are labelled "release testing"
2+
# to the org-wide BTR project board
3+
4+
name: Add release testing issues to the BTR project board
5+
6+
on:
7+
issues:
8+
types: [labeled]
9+
# This workflow is triggered when an issue is labeled with 'release testing'.
10+
# It adds the issue to the BTR project and applies the 'needs triage' label
11+
# if it doesn't already have it.
12+
13+
jobs:
14+
handle-release-testing:
15+
uses: openedx/.github/.github/workflows/add-issue-to-btr-project.yml@master
16+
secrets:
17+
GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
18+
GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}

package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx .",
1818
"snapshot": "fedx-scripts jest --updateSnapshot",
1919
"start": "fedx-scripts webpack-dev-server --progress",
20+
"start:with-theme": "paragon install-theme && npm start && npm install",
2021
"dev": "PUBLIC_PATH=/learning/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
21-
"test": "fedx-scripts jest --coverage --passWithNoTests",
22+
"test": "NODE_ENV=test fedx-scripts jest --coverage --passWithNoTests",
2223
"test:watch": "fedx-scripts jest --watch --passWithNoTests",
2324
"types": "tsc --noEmit"
2425
},
@@ -37,7 +38,7 @@
3738
"@edx/frontend-component-footer": "^14.6.0",
3839
"@edx/frontend-component-header": "^6.2.0",
3940
"@edx/frontend-lib-learning-assistant": "^2.20.0",
40-
"@edx/frontend-lib-special-exams": "^3.5.0",
41+
"@edx/frontend-lib-special-exams": "^4.0.0",
4142
"@edx/frontend-platform": "^8.3.1",
4243
"@edx/openedx-atlas": "^0.7.0",
4344
"@edx/react-unit-test-utils": "^4.0.0",

0 commit comments

Comments
 (0)