Merge branch 'stable-3.1'
* stable-3.1:
Fix ChangeIT#changeDetailsDoesNotRequireIndex
Fix plugin documentation link for checks plugin
CreateGroupPermissionSyncer: Fix malformed Javadoc
Change-Id: Ic9a82be245129328f6c866d6659be18d305355b9
diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt
index c7b88f3..af00d1c 100644
--- a/Documentation/config-plugins.txt
+++ b/Documentation/config-plugins.txt
@@ -276,8 +276,8 @@
link:https://gerrit-review.googlesource.com/admin/repos/plugins/checks[
Project] |
-link:https://gerrit.googlesource.com/plugins/checks/+doc/master/src/main/resources/Documentation/about.md[
-Plugin Documentation]]
+link:https://gerrit.googlesource.com/plugins/checks/+doc/master/README.md[
+Plugin Documentation]
[[egit]]
=== egit
diff --git a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java
index fbb7ed7..996257c 100644
--- a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java
+++ b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java
@@ -45,7 +45,7 @@
* <p>During the transition phase, we have to keep these permissions in sync with the global
* capabilities that serve as the source of truth.
*
- * <p><This class implements a one-way synchronization from the global {@code CREATE_GROUP}
+ * <p>This class implements a one-way synchronization from the global {@code CREATE_GROUP}
* capability in {@code All-Projects} to a {@code CREATE} permission on {@code refs/groups/*} in
* {@code All-Users}.
*/
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 030c44e..f176663 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -4375,10 +4375,10 @@
ListChangesOption.SKIP_DIFFSTAT);
PushOneCommit.Result change = createChange();
- int number = gApi.changes().id(change.getChangeId()).get(options)._number;
+ int number = gApi.changes().id(change.getChangeId()).get()._number;
try (AutoCloseable ignored = disableChangeIndex()) {
- assertThat(gApi.changes().id(project.get(), number).get().changeId)
+ assertThat(gApi.changes().id(project.get(), number).get(options).changeId)
.isEqualTo(change.getChangeId());
}
}
