Merge "CurrentUser.PropertyKey<T>: allow plugins to cache data on users"
diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt
index 86570bd..415cb76 100644
--- a/Documentation/config-plugins.txt
+++ b/Documentation/config-plugins.txt
@@ -118,14 +118,12 @@
these plugins.
The Gerrit Project doesn't provide binaries for these plugins, but
-there are some public services that offer the download of pre-built
+there is one public service that offers the download of pre-built
plugin jars:
* link:https://gerrit-ci.gerritforge.com[CI Server from GerritForge]
-* link:http://builds.quelltextlich.at/gerrit/nightly/index.html[
- CI Server from Quelltextlich]
-The following list gives an overview about available plugins, but the
+The following list gives an overview of available plugins, but the
list may not be complete. You may discover more plugins on
link:https://gerrit-review.googlesource.com/#/admin/projects/?filter=plugins%252F[
gerrit-review].
diff --git a/Documentation/user-submodules.txt b/Documentation/user-submodules.txt
index a8a0262..8f75bf1 100644
--- a/Documentation/user-submodules.txt
+++ b/Documentation/user-submodules.txt
@@ -46,9 +46,9 @@
With this feature, one could attach 'sub' inside of 'super' repository
at path 'sub' by executing the following command when being inside
'super':
-=====
+====
git submodule add ssh://server/sub sub
-=====
+====
Still considering the above example, after its execution notice that
inside the local repository 'super' the 'sub' folder is considered a
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
index 14119b9..ae57be3 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
@@ -90,7 +90,7 @@
},
_computeLabelValueTitle: function(labels, label, value) {
- return labels[label].values[value];
+ return labels[label] && labels[label].values[value];
},
_computeLabelArray: function(labelsObj) {
