Merge branch 'master' into bootstrap

phpmyadmin · Aug 18, 2016 · b9b7fb3 · b9b7fb3
2 parents d695c41 + bf4b2a5
commit b9b7fb3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pmaweb/templates/sponsors.html b/pmaweb/templates/sponsors.html
@@ -46,12 +46,12 @@ <h3>Bronze sponsors</h3>
 
 <div class="logos">
 <a href="https://www.hostname.cl/">hostname.cl</a>
-<a href="http://www.shimply.com/">Shimply</a>
 <a href="http://www.dailyhosting.net/">DailyHosting.net</a>
 <a href="http://www.appealslawgroup.com/">Appeals Law Group</a>
 <a href="http://makeawebsitehub.com/">makeawebsitehub.com</a>
 <a href="http://www.unbreakableit.com">Orlando IT Services</a>
 <a href="http://bettingappstore.co.uk/">Betting App Store</a>
+<a href="https://www.topbargains.com.au/">Australian Coupons</a>
 </div>
 
 <h2 id="conditions">Becoming sponsor</h2>

diff --git a/pmaweb/templates/version/packages.json b/pmaweb/templates/version/packages.json
@@ -2,16 +2,18 @@
     "packages": {
         "phpmyadmin/phpmyadmin": {
 {% for release in all_releases %}
+{% with release.simpledownload as download %}
+{% if download %}
             "{{ release.version }}": {
                 "name": "phpmyadmin/phpmyadmin",
                 "version": "{{ release.version }}",
                 "dist": {
-{% with release.simpledownload as download %}
                     "url": "{{ download.get_absolute_url }}",
                     "type": "{{ download.composer_type }}"
-{% endwith %}
                 }
             },
+{% endif %}
+{% endwith %}
 {% endfor %}
             "dev-master": {
                 "name": "phpmyadmin/phpmyadmin",

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django<1.8
+Django>=1.8,<1.9
 python-dateutil
 feedparser
 django-markupfield

diff --git a/security/models.py b/security/models.py
@@ -108,7 +108,7 @@ def get_cwes(self):
         return self.cwe.split()
 
     def get_commits(self):
-        lines = self.commits.split('\n')
+        lines = self.commits.strip().split('\n')
         result = []
         for line in lines:
             if ':' in line: