Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
thalia
concrexit
Commits
a9c84329
Commit
a9c84329
authored
Jul 23, 2018
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'trailing_whitespaces' into 'master'
Remove trailing whitespaces See merge request
!873
parents
0cb1bcf0
70bd8b67
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
README.md
README.md
+1
-1
tox.ini
tox.ini
+1
-1
website/events/templates/events/event.html
website/events/templates/events/event.html
+1
-1
No files found.
README.md
View file @
a9c84329
...
...
@@ -32,7 +32,7 @@ Testing and linting
1.
In the root folder of the project, run
`tox`
.
You may get errors about missing interpreters. That is normal and can be
You may get errors about missing interpreters. That is normal and can be
ignored. If you want to run a specific check, you can do the following:
tox -e flake8 # Runs the flake8 linter
...
...
tox.ini
View file @
a9c84329
...
...
@@ -18,7 +18,7 @@ commands =
python
manage.py
makemigrations
--no-input
--check
--dry-run
python
-Wall
-mcoverage
run
--branch
--source
'.'
manage.py
test
safety
check
deps
=
deps
=
coverage
pip-conflict-checker
django20:
django>=2.0rc1,<2.1
...
...
website/events/templates/events/event.html
View file @
a9c84329
...
...
@@ -127,7 +127,7 @@
{% if permissions.create_registration %}
<p>
{% url 'event-registration-terms' as terms_url %}
{% blocktrans trimmed %}
{% blocktrans trimmed %}
By registering,
you confirm that you have read the
<a
target=
"_blank"
href=
"{{ terms_url }}"
>
terms and conditions
</a>
,
that you understand them and that you agree to be bound by them.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment