From b3b654bf03a86d0c15ebbbc91445b41577064a1e Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Thu, 30 Apr 2020 03:21:13 -0400
Subject: [PATCH] Rebase 2.4.0-dev

---
 CTFd/utils/initialization/__init__.py | 2 +-
 CTFd/utils/user/__init__.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CTFd/utils/initialization/__init__.py b/CTFd/utils/initialization/__init__.py
index bcbfcadd..4b496865 100644
--- a/CTFd/utils/initialization/__init__.py
+++ b/CTFd/utils/initialization/__init__.py
@@ -42,6 +42,7 @@ from CTFd.utils.security.csrf import generate_nonce
 from CTFd.utils.user import (
     authed,
     get_current_user_attrs,
+    get_current_user_ips,
     get_current_team_attrs,
     get_ip,
     is_admin,
@@ -201,7 +202,6 @@ def init_request_processors(app):
                     logout_user()
                 clear_user_ips(user_id=session["id"])
 
-            db.session.close()
 
     @app.before_request
     def banned():
diff --git a/CTFd/utils/user/__init__.py b/CTFd/utils/user/__init__.py
index 9a026a5d..5186e2b0 100644
--- a/CTFd/utils/user/__init__.py
+++ b/CTFd/utils/user/__init__.py
@@ -7,7 +7,7 @@ from flask import request, session
 from CTFd.cache import cache
 from CTFd.constants.users import UserAttrs
 from CTFd.constants.teams import TeamAttrs
-from CTFd.models import Fails, Users, db, Teams
+from CTFd.models import Fails, Users, db, Teams, Tracking
 from CTFd.utils import get_config