Merge "Merge branch 'stable-3.8' into stable-3.9" into stable-3.9
diff --git a/Documentation/cmd-ls-projects.txt b/Documentation/cmd-ls-projects.txt
index 1dd6720..ebd365a 100644
--- a/Documentation/cmd-ls-projects.txt
+++ b/Documentation/cmd-ls-projects.txt
@@ -58,6 +58,21 @@
Displays project inheritance in a tree-like format.
This option does not work together with the show-branch option.
+[NOTE]
+If the calling user does not meet any of the following criteria:
+
+* The state of the parent project is either "ACTIVE" or "READ ONLY",
+and the calling user has READ permission to at least one ref.
+* The state of the parent project is "HIDDEN" and the calling user
+has READ permission for 'refs/meta/config'.
+
+Then the 'parent' field will be labeled as '?-N', where N represents the
+nesting level within the project's tree structure. In the provided example,
+'All-Projects' corresponds to level 1, 'parent-project' to level 2, and
+'child-project' to level 3.
+
+The output format to display the results should be `json` or `json_compact`.
+
--type::
Display only projects of the specified type. If not
specified, defaults to `all`. Supported types:
diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt
index e583f45..3c88c2e 100644
--- a/Documentation/project-configuration.txt
+++ b/Documentation/project-configuration.txt
@@ -5,7 +5,7 @@
There are several ways to create a new project in Gerrit:
-- in the Web UI under 'Projects' > 'Create Project'
+- click 'CREATE NEW' in the Web UI under 'BROWSE' > 'Repositories'
- via the link:rest-api-projects.html#create-project[Create Project]
REST endpoint
- via the link:cmd-create-project.html[create-project] SSH command
@@ -58,7 +58,7 @@
There are several ways to create a new branch in a project:
-- in the Web UI under 'Projects' > 'List' > <project> > 'Branches'
+- in the Web UI under 'BROWSE' > 'Repositories' > <project> > 'Branches'
- via the link:rest-api-projects.html#create-branch[Create Branch]
REST endpoint
- via the link:cmd-create-branch.html[create-branch] SSH command
@@ -84,7 +84,7 @@
There are several ways to delete a branch:
-- in the Web UI under 'Projects' > 'List' > <project> > 'Branches'
+- in the Web UI under 'BROWSE' > 'Repositories' > <project> > 'Branches'
- via the link:rest-api-projects.html#delete-branch[Delete Branch]
REST endpoint
- by using a git client
@@ -114,10 +114,11 @@
For convenience reasons, when the repository is cloned Git creates a
local branch for this default branch and checks it out.
-Project owners can set `HEAD`
+Project owners can set `HEAD` several ways:
-- in the Web UI under 'Projects' > 'List' > <project> > 'Branches' or
+- in the Web UI under 'BROWSE' > 'Repositories' > <project> > 'Branches'
- via the link:rest-api-projects.html#set-head[Set HEAD] REST endpoint
+- via the link:cmd-set-head.html[Set HEAD] SSH command
GERRIT
diff --git a/java/com/google/gerrit/server/group/db/GroupConfig.java b/java/com/google/gerrit/server/group/db/GroupConfig.java
index 3470a6c..682fd15 100644
--- a/java/com/google/gerrit/server/group/db/GroupConfig.java
+++ b/java/com/google/gerrit/server/group/db/GroupConfig.java
@@ -19,7 +19,6 @@
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.joining;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -89,9 +88,9 @@
* doesn't have any members or subgroups.
*/
public class GroupConfig extends VersionedMetaData {
- @VisibleForTesting public static final String GROUP_CONFIG_FILE = "group.config";
- @VisibleForTesting public static final String MEMBERS_FILE = "members";
- @VisibleForTesting public static final String SUBGROUPS_FILE = "subgroups";
+ public static final String GROUP_CONFIG_FILE = "group.config";
+ public static final String MEMBERS_FILE = "members";
+ public static final String SUBGROUPS_FILE = "subgroups";
private static final Pattern LINE_SEPARATOR_PATTERN = Pattern.compile("\\R");
/**
diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
index 51f43ce..f95c598 100644
--- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
+++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
@@ -519,18 +519,22 @@
@Inject
protected ChangeQueryBuilder(Arguments args) {
this(mydef, args);
- setupAliases();
}
@VisibleForTesting
protected ChangeQueryBuilder(Definition<ChangeData, ChangeQueryBuilder> def, Arguments args) {
super(def, args.opFactories);
this.args = args;
+ setupAliases();
}
private void setupAliases() {
- setOperatorAliases(args.operatorAliasConfig.getChangeQueryOperatorAliases());
- hasOperandAliases = args.hasOperandAliasConfig.getChangeQueryHasOperandAliases();
+ if (args.operatorAliasConfig != null) {
+ setOperatorAliases(args.operatorAliasConfig.getChangeQueryOperatorAliases());
+ }
+ if (args.hasOperandAliasConfig != null) {
+ hasOperandAliases = args.hasOperandAliasConfig.getChangeQueryHasOperandAliases();
+ }
}
public ChangeQueryBuilder asUser(CurrentUser user) {
diff --git a/tools/deps.bzl b/tools/deps.bzl
index f6ee1d8..dbc7b4f 100644
--- a/tools/deps.bzl
+++ b/tools/deps.bzl
@@ -19,7 +19,7 @@
# When updating Bouncy Castle, also update it in bazlets.
BC_VERS = "1.72"
HTTPCOMP_VERS = "4.5.2"
-JETTY_VERS = "9.4.51.v20230217"
+JETTY_VERS = "9.4.53.v20231009"
BYTE_BUDDY_VERSION = "1.10.7"
ROARING_BITMAP_VERSION = "0.9.44"
@@ -483,50 +483,50 @@
maven_jar(
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
- sha1 = "3ec1be0b1ca49b633dd7de0733d0054bb4763965",
+ sha1 = "6670d6a54cdcaedd8090e8cf420fd5dd7d08e859",
)
maven_jar(
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
- sha1 = "a3342214ce480cc5bb8e74fe7589dd0436a5d903",
+ sha1 = "6fbc8ebe9046954dc2f51d4ba69c8f8344b05f7f",
)
maven_jar(
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
- sha1 = "d0572c8460eb26adf8420e78535d95859c89a936",
+ sha1 = "8b0e761a0b359db59dae77c00b4213b0586cb994",
)
maven_jar(
name = "jetty-jmx",
artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
- sha1 = "a69e9b0a223a5f661606f6fb36d3b3fcf6216432",
+ sha1 = "f0392f756b59f65ea7d6be41bf7a2f7b2c7c98d5",
)
maven_jar(
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
- sha1 = "fe37568aded59dd8e437e0f670fe5f809071fe8f",
+ sha1 = "87faf21eb322753f0527bcb88c43e67044786369",
)
maven_jar(
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
- sha1 = "a11a0713b17334a5b6e694602fbd1a9457cb5fdd",
+ sha1 = "70cf7649b27c964ad29bfddf58f3bfe0d30346cf",
)
maven_jar(
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
- sha1 = "a11df06530a3a28c9af7ff336730a2f8e18e7205",
+ sha1 = "f72bb4f687b4454052c6f06528ba9910714df947",
)
maven_jar(
name = "jetty-util-ajax",
artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERS,
- sha1 = "3b2a998a5ed1f93bc1878fa89d65e307d8b8ebaf",
- src_sha1 = "027a15819d3fd1f18e1890bd1bf04b7d48cb3da4",
+ sha1 = "4d20f6206eb7747293697c5f64c2dc5bf4bd54a4",
+ src_sha1 = "1aed8017c3c8a449323901639de6b4eb3b1f02ea",
)
maven_jar(
