Merge branch 'stable-2.11'

* stable-2.11:
  Show correct change status for draft patch sets
  Add an acceptance test for pushing changes with Signed-off-by
  Fix client error when current patch set is not visible to user
  ReceiveCommits: Include canonical URL in "change closed" error
  ListDashboards: Use correct channel for logger
  Call NewProjectCreatedListeners after project creation is complete
  PushOneCommit: Fix usage of assertThat

Change-Id: I6cda7b102dae54894f8c88b395aa48572c823d86
This commit is contained in:
David Pursehouse
2015-08-05 17:12:43 +09:00
9 changed files with 70 additions and 22 deletions

View File

@@ -82,7 +82,7 @@ class PatchSetSelectBox extends Composite {
}
void setUpPatchSetNav(JsArray<RevisionInfo> list, DiffInfo.FileMeta meta,
boolean editExists, int currentPatchSet, boolean open, boolean binary) {
boolean editExists, boolean current, boolean open, boolean binary) {
InlineHyperlink baseLink = null;
InlineHyperlink selectedLink = null;
if (sideA) {
@@ -112,7 +112,7 @@ class PatchSetSelectBox extends Composite {
}
if (!binary && open && idActive != null && Gerrit.isSignedIn()) {
if ((editExists && idActive.get() == 0)
|| (!editExists && idActive.get() == currentPatchSet)) {
|| (!editExists && current)) {
linkPanel.add(createEditIcon());
}
}