Skip to content
Snippets Groups Projects
Verified Commit 40ecc42d authored by mirabilos's avatar mirabilos Committed by mirabilos
Browse files

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)
parent a4200e15
No related branches found
No related tags found
1 merge request!83Fix trailing whitespace and space before tab in indent
Pipeline #449 passed with warnings
...@@ -28,7 +28,7 @@ test: ...@@ -28,7 +28,7 @@ test:
- adduser --disabled-password --gecos "Test User" testuser - adduser --disabled-password --gecos "Test User" testuser
- chown -R testuser . - chown -R testuser .
script: script:
- sudo -u testuser - sudo -u testuser
env TEST_SELENIUM_HUB=http://selenium:4444/wd/hub env TEST_SELENIUM_HUB=http://selenium:4444/wd/hub
TEST_SELENIUM_BROWSERS=firefox TEST_SELENIUM_BROWSERS=firefox
TEST_HOST=build TEST_HOST=build
...@@ -92,7 +92,7 @@ deploy_demo-master: ...@@ -92,7 +92,7 @@ deploy_demo-master:
stage: deploy stage: deploy
environment: environment:
name: demo/master name: demo/master
url: http://demo-master.biscuit-sis.org url: http://demo-master.biscuit-sis.org
before_script: before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
......
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
{% bootstrap_form form %} {% bootstrap_form form %}
<button type="submit" class="btn btn-dark"> <button type="submit" class="btn btn-dark">
{% blocktrans %}Login{% endblocktrans %} {% blocktrans %}Login{% endblocktrans %}
</button> </button>
</form> </form>
{% endblock %} {% endblock %}
...@@ -6,7 +6,7 @@ remove_pip_metadata() { ...@@ -6,7 +6,7 @@ remove_pip_metadata() {
case "$1" in case "$1" in
"install-all") "install-all")
set -e set -e
cd "$(dirname "$0")" cd "$(dirname "$0")"
remove_pip_metadata remove_pip_metadata
poetry lock poetry lock
...@@ -22,34 +22,34 @@ case "$1" in ...@@ -22,34 +22,34 @@ case "$1" in
set +e set +e
;; ;;
"makemessages") "makemessages")
cd "$(dirname "$0")" cd "$(dirname "$0")"
manage_py=$(realpath manage.py) manage_py=$(realpath manage.py)
locales="-l ar -l de_DE -l fr -l nb_NO -l tr_TR" locales="-l ar -l de_DE -l fr -l nb_NO -l tr_TR"
for d in biscuit/core apps/official/*/biscuit/apps/*; do for d in biscuit/core apps/official/*/biscuit/apps/*; do
echo; echo "Entering $d." echo; echo "Entering $d."
poetry run sh -c "cd $d; $manage_py makemessages --no-wrap -i static $locales" poetry run sh -c "cd $d; $manage_py makemessages --no-wrap -i static $locales"
done done
;; ;;
"autopep8") "autopep8")
cd "$(dirname "$0")" cd "$(dirname "$0")"
for d in biscuit/core apps/official/*/biscuit/apps/*; do for d in biscuit/core apps/official/*/biscuit/apps/*; do
echo; echo "Entering $d." echo; echo "Entering $d."
poetry run sh -c "cd $d; autopep8 -i -r ." poetry run sh -c "cd $d; autopep8 -i -r ."
done done
;; ;;
"pylama") "pylama")
cd "$(dirname "$0")" cd "$(dirname "$0")"
tox_ini=$(realpath tox.ini) tox_ini=$(realpath tox.ini)
for d in biscuit/core apps/official/*/biscuit/apps/*; do for d in biscuit/core apps/official/*/biscuit/apps/*; do
echo; echo "Entering $d." echo; echo "Entering $d."
poetry run sh -c "cd $d; pylama -a -o $tox_ini ." poetry run sh -c "cd $d; pylama -a -o $tox_ini ."
done done
;; ;;
"gource") "gource")
for d in biscuit/core apps/official/*/biscuit/apps/*; do for d in biscuit/core apps/official/*/biscuit/apps/*; do
gource --output-custom-log - "$d" gource --output-custom-log - "$d"
done | sort -n | gource --log-format custom --background-image biscuit/core/static/img/biscuit-logo.png - done | sort -n | gource --log-format custom --background-image biscuit/core/static/img/biscuit-logo.png -
;; ;;
*) *)
;; ;;
esac esac
...@@ -16,4 +16,4 @@ help: ...@@ -16,4 +16,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new # Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile %: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment