GetAmbassador · jpclark6 · Sep 28, 2016 · Sep 29, 2016 · Sep 29, 2016 · Sep 29, 2016
diff --git a/.coveragerc b/.coveragerc
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ django_autocomplete_light.egg-info/
 *swp
 docs/docs
 __pycache__
-*.mo
 test_env/
 .coverage
 .tox

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "jquery-autocomplete-light"]
-	path = jquery-autocomplete-light
-	url = https://github.com/yourlabs/jquery-autocomplete-light.git
+[submodule "src/dal_select2/static/vendor/select2"]
+	path = src/dal_select2/static/vendor/select2
+	url = https://github.com/select2/select2.git
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
@@ -11,8 +11,13 @@ pip install -U pip
 
 pip install -r ${OPENSHIFT_REPO_DIR}test_project/requirements.txt
 
+# Broken dep pulled in by taggit
+if pip freeze | grep south; then
+    pip uninstall -y south
+fi
+
 pushd ${OPENSHIFT_REPO_DIR}test_project
-python manage.py migrate --fake-initial --noinput
+./manage.py migrate --fake-initial --noinput
 mkdir -p wsgi
 ./manage.py collectstatic --noinput
 popd

diff --git a/.openshift/cron/hourly/reset_database b/.openshift/cron/hourly/reset_database
@@ -4,5 +4,6 @@ set -x
 source ${OPENSHIFT_HOMEDIR}app-root/runtime/dependencies/python/virtenv/bin/activate
 
 pushd ${OPENSHIFT_REPO_DIR}test_project
-./manage.py loaddata ${OPENSHIFT_DATA_DIR}reset.json
+rm -rf db.sqlite
+./manage.py migrate --noinput
 popd
diff --git a/CHANGES.txt b/CHANGES.txt