The Unified and Autonomous Development Platform
fix: crash when create a pr.
sususweet8589e43631a3
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 4545435e16..2419aaaabf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -453,6 +453,25 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();setVisible(!getPullRequest().isMerged());+ add(new Label("aheadBehind", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());+ RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();+ AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));+ return "Source branch is " + ab.getAhead() + " commit(s) ahead of target branch, " + ab.getBehind() + " commit(s) behind of target branch";+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged());+ }++ });}});summaryContainer.add(new WebMarkupContainer("hasMergeConflict") {@@ -534,25 +553,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});- summaryContainer.add(new Label("aheadBehind", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());- RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();- AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));- return "Source branch is " + ab.getAhead() + " commit(s) ahead of target branch, " + ab.getBehind() + " commit(s) behind of target branch";- }-- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getPullRequest().isMerged());- }-- });summaryContainer.add(new WebMarkupContainer("noValidCommitSignature") {@Override