| commit | 45d41bd430fef378841669b8b7fdc16d646359b9 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Fri Jul 21 01:03:00 2023 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Fri Jul 21 01:03:00 2023 +0100 |
| tree | aabd4d264d959a0c1f3d1914f7c446c476579122 | |
| parent | 6ba95a708718b28ac03cdbb8c305d5d8a6af6631 [diff] | |
| parent | ae94e8edfea1262c26ea804c71e568a1a825879c [diff] |
Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Use PullReplicationFilter in Gerrit primary setup Ignore invalid createChange replication test on Gerrit replica Allow replication of hidden projects Fix ApplyObjectIT flaky test Change-Id: Ic1b3cd66d6087d05f2e6712c36a9f49c9cd82048
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java index aff1266..33cc3e8 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -216,4 +216,9 @@ public int getPushBatchSize() { return 0; } + + @Override + public boolean replicateNoteDbMetaRefs() { + return true; + } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java index cf7515e..7c7846c 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
@@ -23,7 +23,6 @@ import com.google.inject.Inject; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.methods.HttpRequestBase; -import org.junit.Ignore; import org.junit.Test; public class ProjectDeletionActionIT extends ActionITBase { @@ -80,7 +79,6 @@ @Test @GerritConfig(name = "gerrit.instanceId", value = "testInstanceId") - @Ignore("Failing in RestApiServlet: to be enabled again once that is fixed in core") public void shouldReturnBadRequestWhenDeletingAnInvalidProjectName() throws Exception { url = getURLWithAuthenticationPrefix(INVALID_TEST_PROJECT_NAME);