From 104470ee008817df4a3b78d24e524e8c92eac9a0 Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Fri, 15 Oct 2021 17:03:58 -0400 Subject: WIP merge of master into cobbler Squashed commit of the following: commit 35b9f39178cc502a5283a1b37a65f7dd0838ae05 Author: Sawyer Bergeron Date: Fri Oct 15 14:14:46 2021 -0400 Merge User Booking API Rev 1 (Try 3) Signed-off-by: Sawyer Bergeron Change-Id: Ie1eee0a59929f8da39f16bb6bc17ae3de4f1cba9 Signed-off-by: Sawyer Bergeron commit b3ed8ebcf536c021330e7ccbc0376f6b89189348 Author: Jacob Hodgdon Date: Tue Jul 20 09:55:04 2021 -0400 Additional changes for rebrand Signed-off-by: Jacob Hodgdon Change-Id: Ibd525f966b3ed3aebdbe688e5ee5daa4ea1cf294 Signed-off-by: Jacob Hodgdon Signed-off-by: Raven Hodgdon commit 17b6c7809771ac8bf3879add033d2169f671591a Author: Jacob Hodgdon Date: Fri May 14 15:42:56 2021 -0400 Color fixes for rebrand Signed-off-by: Jacob Hodgdon Change-Id: I5cf4ede598afa377db7ecec17d8dfef085e130ac Change-Id: I55494d24bcef74def85236b09168508e428d368e Signed-off-by: Sawyer Bergeron --- src/booking/views.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/booking/views.py') diff --git a/src/booking/views.py b/src/booking/views.py index e7ffc42..940428b 100644 --- a/src/booking/views.py +++ b/src/booking/views.py @@ -131,7 +131,6 @@ class ResourceBookingsJSON(View): 'start', 'end', 'purpose', - 'jira_issue_status', 'config_bundle__name' ) return JsonResponse({'bookings': list(bookings)}) -- cgit 1.2.3-korg