opendev/gerrit
Code Issues Proposed changes

Submit: Fix wrong conflict resolution

Browse Source 
This amends commit 016642aa60.

The merge effectively reverted part of
4c58e1031f.

Change-Id: Icd441ce2a8f0fcd866d1b0e51e9d448581d51563
This commit is contained in:
Orgad Shaneh
2017-11-12 15:53:20 +02:00
parent a1a8609f8b
commit 0a2e3d0edf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/restapi/change/Submit.java
View File

@@ -293,7 +293,7 @@ public class Submit
@Override @Override
public UiAction.Description getDescription(RevisionResource resource) { public UiAction.Description getDescription(RevisionResource resource) {
Change change = resource.getChange(); Change change = resource.getChange();
if (!change.getStatus().isOpen() || !resource.isCurrent()) { if (!change.isNew() || !resource.isCurrent()) {
return null; // submit not visible return null; // submit not visible
} }