Skip to content

Commit

Permalink
Merge branch 'develop' into docker/persistent-data
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleecodes authored Jan 15, 2025
2 parents ce618d3 + 4aaeb43 commit db4862f
Show file tree
Hide file tree
Showing 6 changed files with 687 additions and 688 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
SIMPLYBOOK_CREDENTIALS: '{"login": "login"}'
STORYBLOK_WEBHOOK_SECRET: ${{ secrets.STORYBLOK_WEBHOOK_SECRET }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ['javascript']
language: ['javascript', 'typescript']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/community-issue-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: `Thank you @${context.payload.issue.assignee.login} you have been assigned this issue!
**Please follow the directions in our [Contributing Guide](https://github.com/chaynHQ/.github/blob/main/docs/CONTRIBUTING.md). We look forward to reviewing your pull request. ✨**
**Please follow the directions in our [Contributing Guide](https://github.com/chaynHQ/bloom-backend/blob/develop/CONTRIBUTING.md). We look forward to reviewing your pull request. ✨**
---
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"crisp-api": "^9.4.0",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"firebase": "^10.10.0",
"firebase-admin": "^12.2.0",
"firebase": "^11.1.0",
"firebase-admin": "^13.0.2",
"lodash": "^4.17.21",
"nestjs-cls": "^4.4.1",
"newrelic": "^12.5.1",
Expand All @@ -61,11 +61,11 @@
"typeorm": "^0.3.20"
},
"devDependencies": {
"@eslint/js": "^9.11.1",
"@eslint/js": "^9.18.0",
"@golevelup/ts-jest": "^0.5.0",
"@nestjs/cli": "^10.3.2",
"@nestjs/cli": "^10.4.9",
"@nestjs/schematics": "^10.2.3",
"@nestjs/testing": "^10.4.6",
"@nestjs/testing": "^10.4.15",
"@types/date-fns": "^2.6.0",
"@types/express": "^5.0.0",
"@types/jest": "^29.5.13",
Expand Down
1 change: 0 additions & 1 deletion src/user/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ export class UserService {
.createQueryBuilder('user')
.leftJoinAndSelect('user.partnerAccess', 'partnerAccess')
.leftJoinAndSelect('user.partnerAdmin', 'partnerAdmin')
.leftJoinAndSelect('partnerAccess.therapySession', 'therapySession')
.leftJoinAndSelect('partnerAccess.partner', 'partner')
.leftJoinAndSelect('partnerAccess.partner', 'partnerAccessPartner')
.leftJoinAndSelect('partnerAdmin.partner', 'partnerAdminPartner')
Expand Down
Loading

0 comments on commit db4862f

Please sign in to comment.