opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Update 2.13.2 release notes
  Fix minor typo in projects REST API documentation
  Fix double Repository.close() in MergeOp
  Fix malformed account suggestions

Change-Id: I3d785e99cb669a11c95bc6f6c991232f41977cd9
This commit is contained in:
David Pursehouse
2016-10-03 13:32:01 +09:00
parent 26abcf54b3 5bbbf77933
commit f3346faf27
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/rest-api-access.txt
View File

@@ -334,10 +334,10 @@ The action of this rule. For normal permissions this can be `ALLOW`,
|`force` |not set if `false`|
Whether the force flag is set.
|`min` |
not set if range if empty (from `0` to `0`) or not set|
not set if range is empty (from `0` to `0`) or not set|
The min value of the permission range.
|`max` |
not set if range if empty (from `0` to `0`) or not set|
not set if range is empty (from `0` to `0`) or not set|
The max value of the permission range.
|==================================

12
ReleaseNotes/ReleaseNotes-2.13.2.txt
View File

@@ -20,6 +20,18 @@ Read project watches from database.
Project watches were being read from the git backend by default, but the
migration to git is not yet completed.
* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4632[Issue 4632]:
Fix server error when deleting multiple SSH keys from the Web UI.
+
Attempting to delete multiple keys in parallel resulted in a lock failure
when removing the keys from the git backend.
* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4645[Issue 4645]:
Fix malformed account suggestions.
+
If the query contained several query terms and one of the query terms was
a substring of 'strong', the suggestion was malformed.
* Hooks plugin: Fix incorrect value passed to `--change-url` parameter.
+
The URL was being generated using the change's Change-Id rather than the

11
gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
View File

@@ -88,17 +88,24 @@ public abstract class HighlightSuggestOracle extends SuggestOracle {
ds = escape(ds);
}
StringBuilder pattern = new StringBuilder();
for (String qterm : splitQuery(qstr)) {
qterm = "(" + escape(qterm) + ")";
qterm = escape(qterm);
// We now surround qstr by <strong>. But the chosen approach is not too
// smooth, if qstr is small (e.g.: "t") and this small qstr may occur in
// escapes (e.g.: "Tim &lt;email@example.org&gt;"). Those escapes will
// get <strong>-ed as well (e.g.: "&lt;" -> "&<strong>l</strong>t;"). But
// as repairing those mangled escapes is easier than not mangling them in
// the first place, we repair them afterwards.
ds = sgi(ds, qterm, "<strong>$1</strong>");
if (pattern.length() > 0) {
pattern.append("|");
}
pattern.append(qterm);
}
ds = sgi(ds, "(" + pattern.toString() + ")", "<strong>$1</strong>");
// Repairing <strong>-ed escapes.
ds = sgi(ds, "(&[a-z]*)<strong>([a-z]*)</strong>([a-z]*;)", "$1$2$3");