opendev/gerrit
Code Issues Proposed changes

Merge "Ignore mergeable bit in ApprovalTable for merged changes" into stable-2.6

Browse Source
This commit is contained in:
Shawn Pearce
2013-04-03 04:03:56 +00:00
committed by Gerrit Code Review
parent f52b695088 c468fe9318
commit ce460e0f87
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
View File

@@ -33,6 +33,7 @@ import com.google.gerrit.client.ui.ReviewerSuggestOracle;
import com.google.gerrit.common.data.ApprovalDetail; import com.google.gerrit.common.data.ApprovalDetail;
import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray; import com.google.gwt.core.client.JsArray;
import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickEvent;
@@ -154,6 +155,7 @@ public class ApprovalTable extends Composite {
} }
if (Gerrit.getConfig().testChangeMerge() if (Gerrit.getConfig().testChangeMerge()
&& change.status() != Change.Status.MERGED
&& !change.mergeable()) { && !change.mergeable()) {
addMissingLabel(Util.C.messageNeedsRebaseOrHasDependency()); addMissingLabel(Util.C.messageNeedsRebaseOrHasDependency());
} }