Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/production'
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Nov 5, 2024
2 parents 638f43f + acf0eb3 commit 094e3ad
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 44 deletions.
7 changes: 7 additions & 0 deletions CHANGE_LOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.13.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.13.0...v1.13.1) (2024-11-05)


### Bug Fixes

* revert prisma to 5.16.1 ([#336](https://github.com/oaknational/oak-ai-lesson-assistant/issues/336)) ([a593618](https://github.com/oaknational/oak-ai-lesson-assistant/commit/a593618b013607fbde75cfa98663d7298db7ff89))

# [1.13.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.12.1...v1.13.0) (2024-10-31)


Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@oaknational/oak-components": "^1.26.0",
"@oaknational/oak-consent-client": "^2.1.0",
"@portabletext/react": "^3.1.0",
"@prisma/client": "^5.21.1",
"@prisma/client": "5.16.1",
"@prisma/extension-accelerate": "^1.0.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-icons": "^1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@manypkg/cli": "^0.21.1",
"@next/env": "14.2.15",
"@oakai/prettier-config": "*",
"@prisma/client": "^5.21.1",
"@prisma/client": "5.16.1",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"prettier": "@oakai/prettier-config",
"dependencies": {
"@oakai/logger": "*",
"@prisma/client": "^5.21.1",
"@prisma/client": "5.16.1",
"@types/chunk-text": "^1.0.0",
"cheerio": "1.0.0-rc.12",
"chunk-text": "^2.0.1",
Expand All @@ -73,7 +73,7 @@
"devDependencies": {
"@oakai/prettier-config": "*",
"dotenv-cli": "^6.0.0",
"prisma": "^5.21.0",
"prisma": "5.16.1",
"typescript": "5.3.3",
"zod-prisma": "^0.5.4"
},
Expand Down
78 changes: 38 additions & 40 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 094e3ad

Please sign in to comment.