Merge remote-tracking branch 'origin/v3.5.2-based' into v3.5.3-basedv3.5.3-based

* origin/v3.5.2-based:
  Fix issue of some changes not loading
  Clear attention set when change is deferred
  Add label score extension points for plugin customization
  Add integrating section to change dashboard
  Fix submodule urls
  Modify Gerrit version string to indicate that this is a Qt fork
  Add QtStage permission
  Update status values staged, integrating and deferred for client side modules
  Update status values staged, integrating and deferred for java modules

Change-Id: I7a780ad7b08f97982d86d5a34d472c5b7bc3e3c5
Task-number: QTQAINFRA-5213

1 files changed, 3 insertions, 0 deletions

diff --git a/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/java/com/google/gerrit/server/notedb/ChangeUpdate.java
index cc9b1934c4..8a9fba1c74 100644
--- a/java/com/google/gerrit/server/notedb/ChangeUpdate.java
+++ b/java/com/google/gerrit/server/notedb/ChangeUpdate.java
@@ -675,6 +675,9 @@ public class ChangeUpdate extends AbstractChangeUpdate {
       if (status.equals(Change.Status.ABANDONED)) {
         clearAttentionSet("Change was abandoned");
       }
+      if (status.equals(Change.Status.DEFERRED)) {
+        clearAttentionSet("Change was deferred");
+      }
       if (status.equals(Change.Status.MERGED)) {
         clearAttentionSet("Change was submitted");
       }