Merge pull request #262 from ComputerScienceHouse/develop

Updating master with health check

Author: devinmatte

conditional/__init__.py

@@ -149,6 +149,14 @@ def logout():
     return redirect("/", 302)
 
 
+@app.route("/health")
+def health():
+    """
+    Shows an ok status if the application is up and running
+    """
+    return {'status': 'ok'}
+
+
 @app.errorhandler(404)
 @app.errorhandler(500)
 @auth.oidc_auth

package.json

@@ -36,7 +36,7 @@
     "enumify": "^1.0.4",
     "jquery": "^3.1.0",
     "load-awesome": "^1.1.0",
-    "lodash": "4.17.11",
+    "lodash": "4.17.19",
     "reveal.js": "^3.3.0",
     "selectize": "^0.12.2",
     "selectize-scss": "^0.9.1",