diff options
| -rw-r--r-- | java/com/google/gerrit/server/query/change/ChangeData.java | 2 | ||||
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index a69d837c6d..82f85e924e 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -1229,8 +1229,6 @@ public class ChangeData { mergeable = true; } else if (c.isAbandoned()) { return null; - } else if (c.isWorkInProgress()) { - return null; } else { if (!lazyload()) { return null; diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index c9c5c2c1c8..ceceaacbca 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -4791,6 +4791,8 @@ public class ChangeIT extends AbstractDaemonTest { public void changeQueryReturnsMergeableWhenGerritIndexMergeable() throws Exception { String changeId = createChange().getChangeId(); assertThat(gApi.changes().query(changeId).get().get(0).mergeable).isTrue(); + gApi.changes().id(changeId).setWorkInProgress(); + assertThat(gApi.changes().query(changeId).get().get(0).mergeable).isTrue(); } @Test |