commit 7dbbb80180805bfc21a81a6e770b6724c8f47024
author Nasser Grainawi <nasser@codeaurora.org> Wed Aug 11 13:10:30 2021 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Wed Aug 11 13:10:30 2021 -0600
tree d484cb4e0e5beb740b9b4cabe87dacb5eaf513a2
parent df51ec4a465a83eeddfc9875d5fc53c9955d75af
parent 7d8ab2ad206e927c8e57844d08bc9e4cfdff0140

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Modules: Add missing GetChange binding

Change-Id: I6bfc638b6878166eb600505619263b124567f2ae

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 4bbfd4c..028abcc 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "321fab31e6fbb63c940aad3252f0167f88d52e2e",
+    commit = "f96f4bce9ffafeaa200fc009a378921c512fcb0a",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

gr-task-plugin/gr-task-plugin.html

diff --git a/gr-task-plugin/gr-task-plugin.html b/gr-task-plugin/gr-task-plugin.html
index ea59b9f..c6c3746 100644
--- a/gr-task-plugin/gr-task-plugin.html
+++ b/gr-task-plugin/gr-task-plugin.html
@@ -83,7 +83,7 @@
   <template>
     <template is="dom-repeat" as="task" items="[[tasks]]">
       <template is="dom-if" if="[[_can_show(show_all, task)]]">
-        <li>
+        <li style="padding: 0.2em;">
           <style>
             /* Matching colors with core code. */
             .green {
@@ -115,9 +115,11 @@
           [[task.message]]
         </li>
       </template>
+      <ul style="list-style-type:none; margin: 0 0 0 0; padding: 0 0 0 2em;">
       <gr-task-plugin-tasks
           tasks="[[task.sub_tasks]]"
           show_all$="[[show_all]]"> </gr-task-plugin-tasks>
+      </ul>
     </template>
   </template>
   <script>

gr-task-plugin/gr-task-plugin.js

diff --git a/gr-task-plugin/gr-task-plugin.js b/gr-task-plugin/gr-task-plugin.js
index e49f493..50c49ef 100644
--- a/gr-task-plugin/gr-task-plugin.js
+++ b/gr-task-plugin/gr-task-plugin.js
@@ -130,7 +130,7 @@
       return icon;
     },
 
-    _computeShowOnNeedsAndBlockedFilter(task) {
+    _isFailOrReadyOrInvalid(task) {
       switch (task.status) {
         case 'FAIL':
         case 'READY':
@@ -140,6 +140,12 @@
       return false;
     },
 
+    _computeShowOnNeedsAndBlockedFilter(task) {
+      return this._isFailOrReadyOrInvalid(task) ||
+        (task.sub_tasks && task.sub_tasks.some(t =>
+          this._computeShowOnNeedsAndBlockedFilter(t)));
+    },
+
     _compute_counts(task) {
       this._all_count++;
       switch (task.status) {

test/docker/gerrit/Dockerfile

diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile
index 94c40ff..6d65974 100755
--- a/test/docker/gerrit/Dockerfile
+++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.1.15-ubuntu18
+FROM gerritcodereview/gerrit:3.2.10-ubuntu20
 
 USER root