Skip to content

Commit

Permalink
Merge pull request #234 from hensing/django18
Browse files Browse the repository at this point in the history
update django 1.7 to >=1.8.1 LTS
  • Loading branch information
ThomasWaldmann committed Dec 28, 2015
2 parents c4a9321 + 96fec52 commit 6ea6ac7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions nsupdate/main/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

class GenerateSecretView(UpdateView):
model = Host
fields = "__all__"
template_name = "main/generate_secret.html"

@method_decorator(login_required)
Expand All @@ -54,6 +55,7 @@ def get_context_data(self, **kwargs):

class GenerateNSSecretView(UpdateView):
model = Domain
fields = "__all__"
template_name = "main/generate_ns_secret.html"

@method_decorator(login_required)
Expand Down
2 changes: 1 addition & 1 deletion requirements.d/all.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# packages always needed
dnspython
netaddr
django>=1.7.1, <1.8
django>=1.8.1, <1.9
django-bootstrap-form
django-registration-redux
django-extensions
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
platforms='any',
install_requires=install_requires + [
'netaddr',
'django>=1.7.1, <1.8',
'django>=1.8.1, <1.9',
'django-bootstrap-form',
'django-registration-redux',
'django-extensions',
Expand Down

0 comments on commit 6ea6ac7

Please sign in to comment.