Merge "Merge branch 'stable-3.0' into stable-3.1" into stable-3.1

.bazelversion

@@ -1 +1 @@
-3.4.1
+3.5.0

Documentation/dev-e2e-tests.txt

@@ -180,9 +180,11 @@ time.
 Plugin or otherwise non-core scenarios may do so just as well. The core java package
 `com.google.gerrit.scenarios` from the example above has to be replaced with the one under which
 those scenario classes are. Such extending scenarios can also add extension-specific properties.
-Early examples of this can be found in the Gerrit
+Examples of this can be found in these Gerrit plugins test code:
-`link:https://gerrit.googlesource.com/plugins/high-availability[high-availability]` and
+
-`link:https://gerrit.googlesource.com/plugins/multi-site[multi-site]` plugins test code.
+* `link:https://gerrit.googlesource.com/plugins/high-availability[high-availability]`
+* `link:https://gerrit.googlesource.com/plugins/multi-site[multi-site]`
+* `link:https://gerrit.googlesource.com/plugins/rename-project[rename-project]`
 
 Further above, the `_PROJECT` keyword is prefixed with an underscore, which means that its value
 gets automatically generated by the scenario. Any property setting for it is therefore not

e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject-body.json

@@ -1,3 +1,4 @@
 {
-  "create_empty_commit": "true"
+  "create_empty_commit": "true",
+  "parent": "${parent}"
 }

e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json

@@ -1,5 +1,6 @@
 [
   {
-    "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/projects/PROJECT"
+    "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/projects/PROJECT",
+    "parent": "PARENT"
   }
 ]

e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala

@@ -28,7 +28,7 @@ class CreateProject extends ProjectSimulation {
 
   val test: ScenarioBuilder = scenario(unique)
       .feed(data)
-      .exec(httpRequest.body(RawFileBody(body)).asJson)
+      .exec(httpRequest.body(ElFileBody(body)).asJson)
 
   setUp(
     test.inject(

e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala

@@ -67,6 +67,8 @@ class GerritSimulation extends Simulation {
     case ("number", number) =>
       val precedes = replaceKeyWith("_number", 0, number.toString)
       replaceProperty("number", 1, precedes)
+    case ("parent", parent) =>
+      replaceProperty("parent", "All-Projects", parent.toString)
     case ("project", project) =>
       var precedes = replaceKeyWith("_project", name, project.toString)
       precedes = replaceOverride(precedes)

polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js

@@ -412,7 +412,7 @@
       if (reviewer.account) {
         reviewerId = reviewer.account._account_id || reviewer.account.email;
       } else if (reviewer.group) {
-        reviewerId = reviewer.group.id;
+        reviewerId = decodeURIComponent(reviewer.group.id);
         confirmed = reviewer.group.confirmed;
       }
       return {reviewer: reviewerId, confirmed};