Merge pull request 'fix-ci' (#427 ) from fix-ci into staging

Reviewed-on: #427
fix ci
2024-04-24 07:20:50 +02:00 · 2024-04-24 07:20:16 +02:00 · 2024-04-23 23:23:10 +02:00 · 2024-04-23 23:10:02 +02:00 · 2024-04-23 21:12:37 +02:00 · 2024-04-23 21:11:42 +02:00
1 changed files with 1 additions and 1 deletions
--- a/src/tera/boatreservation.rs
+++ b/src/tera/boatreservation.rs
@@ -15,7 +15,7 @@ use crate::{
        boat::Boat,
        boatreservation::{BoatReservation, BoatReservationToAdd},
        log::Log,
-        user::{DonauLinzUser, User, UserWithRoles},
+        user::{DonauLinzUser, User, UserWithRolesAndNotificationCount},
    },
    tera::log::KioskCookie,
 };
Author	SHA1	Message	Date
philipp	b4f38089ee	Merge pull request 'fix-ci' (#427 ) from fix-ci into staging All checks were successful CI/CD Pipeline / test (push) Successful in 14m21s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m25s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #427	2024-04-24 07:20:50 +02:00
philipp	e22dd8eb51	fix ci Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-04-24 07:20:16 +02:00
philipp	ac9c4b256e	Merge pull request 'allow-reservation-edits' (#424 ) from allow-reservation-edits into main Some checks failed CI/CD Pipeline / test (push) Failing after 6m2s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #424	2024-04-23 23:23:10 +02:00
philipp	cfec4ef8b3	Merge branch 'main' into allow-reservation-edits Some checks failed CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details	2024-04-23 23:10:02 +02:00
philipp	f993eae27f	Merge pull request 'add script to fetch current db' (#422 ) from fetch-db-script into main All checks were successful CI/CD Pipeline / test (push) Successful in 13m56s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 7m39s Details Reviewed-on: #422	2024-04-23 21:12:37 +02:00
philipp	9aefc814a7	Merge pull request '[TASK] group reservations in log to avoid near-duplicates' (#420 ) from group-reservations-in-log into main Some checks are pending CI/CD Pipeline / test (push) Waiting to run Details CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details Reviewed-on: #420	2024-04-23 21:11:42 +02:00
philipp	32dee2c320	Merge pull request 'allow to upload membership pdf for users which don't have it' (#416 ) from allow-membership-uploads into main All checks were successful CI/CD Pipeline / test (push) Successful in 12m49s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m48s Details Reviewed-on: #416	2024-04-22 10:37:49 +02:00
philipp	4a7cd2f085	Merge pull request 'update deps' (#414 ) from update-deps into main All checks were successful CI/CD Pipeline / test (push) Successful in 12m5s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 7m0s Details Reviewed-on: #414	2024-04-19 16:38:31 +02:00
philipp	31d45d6ab4	Merge pull request 'notification-badge' (#401 ) from notification-badge into main Some checks are pending CI/CD Pipeline / test (push) Waiting to run Details CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details Reviewed-on: #401	2024-04-19 16:36:16 +02:00