Merge remote-tracking branch 'origin/main' into dev/task-notification

SE-TINF22B2 · Jun 18, 2024 · bfcd475 · bfcd475
2 parents 3c809a2 + 075f01c
commit bfcd475
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/backend/src/app/goals/goal.service.spec.ts b/backend/src/app/goals/goal.service.spec.ts
@@ -79,7 +79,7 @@ describe('GoalService', () => {
         target: 200,
         value: 100,
         metric: 'steps',
-        synced: dayjs().subtract(2, 'hours').toDate(),
+        synced: goal.synced,
       } as Goal);
 
       const goals = await goalService.getGoalsForUser(

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - backend
     volumes:
       - database:/usr/src/app/database
+      - ${PWD}/.env:/usr/src/app/.env
   webserver:
     build: ./frontend
     ports: