Skip to content

Commit f538d9c

Browse files
authored
Merge pull request #5318 from learningequality/hotfixes
Release v2025.09.29
2 parents 908f53c + be09ab3 commit f538d9c

File tree

1,055 files changed

+69439
-31838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,055 files changed

+69439
-31838
lines changed

.docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This directory is a space for mounting directories to docker containers, allowin
44
### postgres
55
The `postgres` directory is mounted to `/docker-entrypoint-initdb.d`. Any `.sh` or `.sql` files will be executed when the container is first started with a new data volume. You may read more regarding this functionality on the [Docker Hub page](https://hub.docker.com/_/postgres), under _Initialization scripts_.
66

7-
When running docker services through the Makefile commands, it specifies a docker-compose project name that depends on the name of the current git branch. This causes the volumes to change when the branch changes, which is helpful when switching between many branches that might have incompatible database schema changes. The downside is that whenever you start a new branch, you'll have to re-initialize the database again, like with `yarn run devsetup`. Creating a SQL dump from an existing, initialized database and placing it in this directory will allow you to skip this step.
7+
When running docker services through the Makefile commands, it specifies a docker-compose project name that depends on the name of the current git branch. This causes the volumes to change when the branch changes, which is helpful when switching between many branches that might have incompatible database schema changes. The downside is that whenever you start a new branch, you'll have to re-initialize the database again, like with `pnpm run devsetup`. Creating a SQL dump from an existing, initialized database and placing it in this directory will allow you to skip this step.
88

99
To create a SQL dump of your preferred database data useful for local testing, run `make .docker/postgres/init.sql` while the docker postgres container is running.
1010

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ __pycache__
66
*.pyc
77
*.swp
88
k8s/templates/
9-
cloudbuild-*.yaml
9+
cloudbuild-*.yaml

.eslintrc.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const esLintConfig = require('kolibri-tools/.eslintrc');
1+
const esLintConfig = require('kolibri-format/.eslintrc');
22

33
esLintConfig.globals = {
44
$: false,
@@ -8,7 +8,18 @@ esLintConfig.globals = {
88
MathJax: false,
99
jest: false,
1010
};
11-
esLintConfig.settings['import/resolver']['webpack'] = { config: 'webpack.config.js'};
11+
esLintConfig.settings['import/resolver']['webpack'] = { config: require.resolve('./webpack.config.js')};
12+
13+
// Update resolver settings to allow for pnpm's symlinked structure
14+
// https://github.com/import-js/eslint-plugin-import/issues/3110
15+
const nodeResolverSettings = esLintConfig.settings['import/resolver']['node'];
16+
esLintConfig.settings['import/resolver']['node'] = { ...(nodeResolverSettings || {}), preserveSymlinks: false };
17+
18+
// Remove once Vuetify is gone-- Vuetify uses too many unacceptable class names
19+
esLintConfig.rules['kolibri/vue-component-class-name-casing'] = 0;
20+
21+
// Dumb
22+
esLintConfig.rules['vue/no-v-text-v-html-on-component'] = 0;
1223

1324
// Vuetify's helper attributes use hyphens and they would
1425
// not be recognized if auto-formatted to camel case

.git-blame-ignore-revs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Run this command to always ignore formatting commits in `git blame`
2+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
3+
4+
# Linting updates and fixes
5+
a52e08e5c2031cecb97a03fbed49997756ebe01b
6+
8ccaaa60efd1c07b220aefce5a307e4791345111

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/enhancement_template.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/issue_template.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ updates:
2222
babel:
2323
patterns:
2424
- "@babel/*"
25+
tiptap:
26+
patterns:
27+
- "@tiptap/*"
28+
jest:
29+
patterns:
30+
- "jest*"
2531

2632
# Maintain dependencies for Github Actions
2733
- package-ecosystem: "github-actions"

.github/pull_request_template.md

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Handle contributor comment on GitHub issue
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
jobs:
8+
call-workflow:
9+
uses: learningequality/.github/.github/workflows/contributor-issue-comment.yml@main
10+
secrets:
11+
LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
12+
LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}
13+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
14+
SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL: ${{ secrets.SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL }}

0 commit comments

Comments
 (0)