Merge branch 'master' into '114-migrate-to-materialize-css'

# Conflicts:
#   biscuit/core/templates/registration/login.html

.gitlab-ci.yml

@@ -28,7 +28,7 @@ test:
     - adduser --disabled-password --gecos "Test User" testuser
     - chown -R testuser .
   script:
-    - sudo -u testuser 
+    - sudo -u testuser
       env TEST_SELENIUM_HUB=http://selenium:4444/wd/hub
           TEST_SELENIUM_BROWSERS=firefox
           TEST_HOST=build
@@ -92,7 +92,7 @@ deploy_demo-master:
   stage: deploy
   environment:
     name: demo/master
-    url: http://demo-master.biscuit-sis.org  
+    url: http://demo-master.biscuit-sis.org
   before_script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)

dev.sh

@@ -6,7 +6,7 @@ remove_pip_metadata() {
 
 case "$1" in
     "install-all")
-        set -e
+	set -e
 	cd "$(dirname "$0")"
 	remove_pip_metadata
 	poetry lock
@@ -22,34 +22,34 @@ case "$1" in
 	set +e
 	;;
     "makemessages")
-        cd "$(dirname "$0")"
-        manage_py=$(realpath manage.py)
-        locales="-l ar -l de_DE -l fr -l nb_NO -l tr_TR"
-        for d in biscuit/core apps/official/*/biscuit/apps/*; do
-        	echo; echo "Entering $d."
-        	poetry run sh -c "cd $d; $manage_py makemessages --no-wrap -i static $locales"
-        done
-        ;;
+	cd "$(dirname "$0")"
+	manage_py=$(realpath manage.py)
+	locales="-l ar -l de_DE -l fr -l nb_NO -l tr_TR"
+	for d in biscuit/core apps/official/*/biscuit/apps/*; do
+		echo; echo "Entering $d."
+		poetry run sh -c "cd $d; $manage_py makemessages --no-wrap -i static $locales"
+	done
+	;;
     "autopep8")
-        cd "$(dirname "$0")"
-        for d in biscuit/core apps/official/*/biscuit/apps/*; do
-        	echo; echo "Entering $d."
-        	poetry run sh -c "cd $d; autopep8 -i -r ."
-        done
-        ;;
+	cd "$(dirname "$0")"
+	for d in biscuit/core apps/official/*/biscuit/apps/*; do
+		echo; echo "Entering $d."
+		poetry run sh -c "cd $d; autopep8 -i -r ."
+	done
+	;;
     "pylama")
-        cd "$(dirname "$0")"
-        tox_ini=$(realpath tox.ini)
-        for d in biscuit/core apps/official/*/biscuit/apps/*; do
-        	echo; echo "Entering $d."
-        	poetry run sh -c "cd $d; pylama -a -o $tox_ini ."
-        done
-        ;;
+	cd "$(dirname "$0")"
+	tox_ini=$(realpath tox.ini)
+	for d in biscuit/core apps/official/*/biscuit/apps/*; do
+		echo; echo "Entering $d."
+		poetry run sh -c "cd $d; pylama -a -o $tox_ini ."
+	done
+	;;
     "gource")
-        for d in biscuit/core apps/official/*/biscuit/apps/*; do
-        	gource --output-custom-log - "$d"
-        done | sort -n | gource --log-format custom --background-image biscuit/core/static/img/biscuit-logo.png -
-        ;;
+	for d in biscuit/core apps/official/*/biscuit/apps/*; do
+		gource --output-custom-log - "$d"
+	done | sort -n | gource --log-format custom --background-image biscuit/core/static/img/biscuit-logo.png -
+	;;
     *)
 	;;
 esac

docs/Makefile

@@ -16,4 +16,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)