Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Set version to 3.7.7-SNAPSHOT
  Set version to 3.7.6
  Set version to 3.6.9-SNAPSHOT
  Set version to 3.6.8
  Update jgit to 82e277c81339
  Fire `ref-updated` stream events on online edit refs update
  Fix documentation attributes bug
  Introduce Documentation:searchfree_safe with local-only fonts

NOTE: The fix "Fire `ref-updated` stream events on online ..."
has been reverted in this change because there is a similar fix
on stable-3.8. The problem is captured in Issue 312949142.

Release-Notes: skip
Change-Id: I034f4cd31940d601acbcc750782a9047b183ffa8

4 files changed, 25 insertions, 2 deletions

diff --git a/Documentation/BUILD b/Documentation/BUILD
index af355ca56d..85ddbe7413 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -126,3 +126,13 @@ genasciidoc_zip(
     directory = DOC_DIR,
     searchbox = False,
 )
+
+genasciidoc_zip(
+    name = "searchfree_safe",
+    srcs = SRCS,
+    attributes = documentation_attributes(),
+    backend = "html5",
+    directory = DOC_DIR,
+    searchbox = False,
+    webfonts = False,
+)
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index 7d662d4d01..1c3fd78808 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -225,6 +225,19 @@ The html files will be bundled into `searchfree.zip` in this location:
   bazel-bin/Documentation/searchfree.zip
 ----
 
+To use local fonts with the searchfree target:
+
+----
+  bazel build Documentation:searchfree_safe
+----
+
+The html files will be bundled into `searchfree.zip` or `searchfree_safe.zip` in this location:
+
+----
+  bazel-bin/Documentation/searchfree.zip
+  bazel-bin/Documentation/searchfree_safe.zip
+----
+
 To generate HTML files skipping the zip archiving:
 
 ----
diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
index 4d3f2a56d9..e7de3227fb 100644
--- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java
+++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
@@ -72,7 +72,6 @@ public class ChangeEditUtil {
   private final Provider<CurrentUser> userProvider;
   private final ChangeKindCache changeKindCache;
   private final PatchSetUtil psUtil;
-
   private final GitReferenceUpdated gitReferenceUpdated;
 
   @Inject
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl
index 0858d6042f..28de4ec452 100644
--- a/tools/bzl/asciidoc.bzl
+++ b/tools/bzl/asciidoc.bzl
@@ -300,13 +300,14 @@ def genasciidoc_zip(
         backend = None,
         searchbox = True,
         resources = True,
+        webfonts = True,
         **kwargs):
     SUFFIX = "_htmlonly"
 
     _genasciidoc_htmlonly_zip(
         name = name + SUFFIX if resources else name,
         srcs = srcs,
-        attributes = attributes,
+        attributes = attributes + ([] if webfonts else ["webfonts!"]),
         backend = backend,
         searchbox = searchbox,
         **kwargs