Merge branch 'main' into #90-user-profile

# Conflicts: # app/Infrastructure/Http/Controllers/VacationRequestController.php
2022-04-14 10:49:07 +02:00 · 2022-04-14 10:49:07 +02:00 · 8840c61289
commit 8840c61289
parent 71772dbb09 459b62500e
1 changed files with 0 additions and 1 deletions
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@ -107,7 +107,6 @@ class VacationRequestController extends Controller
            ->paginate();

        $users = User::query()
-            ->withVacationLimitIn($yearPeriod)
            ->orderByProfileField("last_name")
            ->orderByProfileField("first_name")
            ->get();