From 40ecc42dedb1de592a4717a053160338a775bb81 Mon Sep 17 00:00:00 2001
From: mirabilos <thorsten.glaser@teckids.org>
Date: Fri, 3 Jan 2020 12:47:44 +0100
Subject: [PATCH] Fix trailing whitespace and space before tab in indent
(everywhere but in LICENCE which has a separate fixup branch;
keep docs/make.bat in CR-LF line endings)
---
.gitlab-ci.yml | 4 +-
.../core/templates/registration/login.html | 2 +-
dev.sh | 52 +++++++++----------
docs/Makefile | 2 +-
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1be1e5ec..c10ca191a 100644
--- a/.gitlab-ci.yml
+++ b/.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)
diff --git a/biscuit/core/templates/registration/login.html b/biscuit/core/templates/registration/login.html
index 155594f3b..2f5ccae31 100644
--- a/biscuit/core/templates/registration/login.html
+++ b/biscuit/core/templates/registration/login.html
@@ -19,6 +19,6 @@
{% bootstrap_form form %}
<button type="submit" class="btn btn-dark">
{% blocktrans %}Login{% endblocktrans %}
- </button>
+ </button>
</form>
{% endblock %}
diff --git a/dev.sh b/dev.sh
index 7449a09ad..acc0fbe7a 100755
--- a/dev.sh
+++ b/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
diff --git a/docs/Makefile b/docs/Makefile
index 298ea9e21..51285967a 100644
--- a/docs/Makefile
+++ b/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)
--
GitLab