opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  SubmoduleSubscriptionsIT: Add config with 'submit whole topic' enabled
  Fix putTopic hook firing
  SubmoduleSubscriptionsIT: Annotate with @NoHttpd
  Change.Id: Avoid NumberFormatException on empty user edit ref
  RelatedChanges: Show "Submitted Together" also for changes with topic
  Set version to 2.11.9
  Release notes for Gerrit 2.11.9
  Fix duplicate links in document
  Fix example for "Set Diff Preferences" in REST API documentation

Change-Id: I74f4e85dda55addfc760fee037b494781b94e3ff
This commit is contained in:
David Pursehouse
2016-05-17 17:20:56 +09:00
parent 3f7c75fd6e deab5c6c68
commit c7f3925202
7 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java
View File

@@ -215,6 +215,11 @@ public class RelatedChanges extends TabPanel {
EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT),
new TabChangeListCallback(Tab.CHERRY_PICKS, info.project(), revision));
// TODO(sbeller): show only on latest revision
ChangeApi.change(info.legacyId().get()).view("submitted_together")
.get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER,
info.project(), revision));
if (!Gerrit.info().change().isSubmitWholeTopicEnabled()
&& info.topic() != null && !"".equals(info.topic())) {
StringBuilder topicQuery = new StringBuilder();
@@ -226,11 +231,6 @@ public class RelatedChanges extends TabPanel {
ListChangesOption.DETAILED_LABELS,
ListChangesOption.LABELS),
new TabChangeListCallback(Tab.SAME_TOPIC, info.project(), revision));
} else {
// TODO(sbeller): show only on latest revision
ChangeApi.change(info.legacyId().get()).view("submitted_together")
.get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER,
info.project(), revision));
}
}