From 0a2e3d0edf12ad409896cf2cf335d2a211e8b98e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Sun, 12 Nov 2017 15:53:20 +0200
Subject: [PATCH] Submit: Fix wrong conflict resolution

This amends commit 016642aa606a5428b269490ba4264e1578ae639b.

The merge effectively reverted part of
4c58e1031f0ba7cf7c455b36ef2db6d4dc27fe21.

Change-Id: Icd441ce2a8f0fcd866d1b0e51e9d448581d51563
---
 java/com/google/gerrit/server/restapi/change/Submit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/google/gerrit/server/restapi/change/Submit.java b/java/com/google/gerrit/server/restapi/change/Submit.java
index 94d1ddf823..9826f02d6f 100644
--- a/java/com/google/gerrit/server/restapi/change/Submit.java
+++ b/java/com/google/gerrit/server/restapi/change/Submit.java
@@ -293,7 +293,7 @@ public class Submit
   @Override
   public UiAction.Description getDescription(RevisionResource resource) {
     Change change = resource.getChange();
-    if (!change.getStatus().isOpen() || !resource.isCurrent()) {
+    if (!change.isNew() || !resource.isCurrent()) {
       return null; // submit not visible
     }