diff options
| author | Shawn Pearce <sop@google.com> | 2013-08-14 12:18:59 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-08-14 12:18:59 -0700 |
| commit | 560beb5079df6fa4d14fa2dbd68566ce429f8c5b (patch) | |
| tree | a0e4d49ea56e236f33dfee4519115b8c86aa459f /gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java | |
| parent | 5995feb5abe2834998a9809cdcfc65efd994397d (diff) | |
| parent | f238e6fefa9715422ceeabb4ba875ebf12cb50b8 (diff) | |
Merge branch 'stable-2.6' into stable-2.7v2.7-rc4v2.7.0-rc4-based
* stable-2.6:
Fix browser NPE when ChangeCache is incomplete
Conflicts:
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
Change-Id: Ib1c1166426c65c5ae44cb2146bc4566b38c16cc4
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java')
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java index c26afaa0a9..c69f915ea3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java @@ -322,7 +322,7 @@ public class ChangeScreen extends Screen dependencies.setAccountInfoCache(detail.getAccounts()); - descriptionBlock.display(detail.getChange(), + descriptionBlock.display(detail, detail.isStarred(), detail.canEditCommitMessage(), detail.getCurrentPatchSetDetail().getInfo(), |