Merge lp:~vorlon/ubuntu-archive-scripts/better-team-report into lp:ubuntu-archive-scripts

[Steve Langasek]

[Michael Hudson-Doyle (mwhudson)]

Makes sense. Can't actually mark this approved it seems.

review: Approve

=== modified file 'templates/team-report.html'
--- templates/team-report.html	2019-02-04 21:38:10 +0000
+++ templates/team-report.html	2019-04-08 23:03:40 +0000
@@ -45,16 +45,6 @@
         {% endif %}
         {{ ngettext("%(num)d day", "%(num)d days", prob.age|int) }}
         <ul>
-          {% if prob.waiting %}
-          <li>
-            Waiting
-            <ul>
-              {% for p in prob.waiting %}
-              <li>{{ p }}</li>
-              {% endfor %}
-            </ul>
-          </li>
-          {% endif %}
           {% if d.get("missing-builds") %}
           <li>Missing builds, see excuses</li>
           {% endif %}
@@ -77,6 +67,16 @@
             </ul>
           </li>
           {% endif %}
+          {% if prob.waiting %}
+          <li>
+            Waiting
+            <ul>
+              {% for p in prob.waiting %}
+              <li>{{ p }}</li>
+              {% endfor %}
+            </ul>
+          </li>
+          {% endif %}
           {% if prob.kind != "regressing-other" %}
           {% if d.get('dependencies', {}).get('blocked-by', []) %}
           <li>Depends on {{ d['dependencies']['blocked-by']|join(", ") }}</li>