From c468fe93189c299def19592e7259d25993589cc7 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 2 Apr 2013 15:53:42 -0700 Subject: [PATCH] Ignore mergeable bit in ApprovalTable for merged changes Since I73896b928a88bcc8ab836a6d5e00e3e43151183f this bit is not set on merged changes. Use the same logic in ApprovalTable as in ChangeJson when setting that bit, so we never see "Needs Rebase" on merged changes. Change-Id: I99cd8e35e72bc48f55d09b20efbe3af5c4ac936a --- .../java/com/google/gerrit/client/changes/ApprovalTable.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java index 0e7bd21493..deb867ca43 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java @@ -33,6 +33,7 @@ import com.google.gerrit.client.ui.ReviewerSuggestOracle; import com.google.gerrit.common.data.ApprovalDetail; import com.google.gerrit.common.data.SubmitRecord; 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.JsArray; import com.google.gwt.event.dom.client.ClickEvent; @@ -154,6 +155,7 @@ public class ApprovalTable extends Composite { } if (Gerrit.getConfig().testChangeMerge() + && change.status() != Change.Status.MERGED && !change.mergeable()) { addMissingLabel(Util.C.messageNeedsRebaseOrHasDependency()); }