diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala
index 2323bab..05d771f 100644
--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -225,7 +225,6 @@
/**
* Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
- *
*/
def updatePullRequests(owner: String, repository: String, branch: String, loginAccount: Account, action: String)(
implicit s: Session,
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index 4018b29..cd4a244 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -80,26 +80,23 @@
style = "height: 200px;"
)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index 09d6c56..3cc395a 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -1,4 +1,4 @@
- @(issue: gitbucket.core.model.Issue,
+@(issue: gitbucket.core.model.Issue,
pullreq: gitbucket.core.model.PullRequest,
commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
comments: Seq[gitbucket.core.model.Comment],
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index bea6a73..8ee2530 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -79,23 +79,23 @@
@if(pullreq.isDraft){
This pull request is still a work in progress.
-
-
-
+
+
+
Draft pull requests cannot be merged.
} else {
@if(status.hasMergePermission){
- Merging can be performed automatically.
-
- Merging can be performed automatically.
-
+ Merging can be performed automatically.
+
+ Merging can be performed automatically.
+
} else {
- This branch has no conflicts with the base branch.
-
- Only those with write access to this repository can merge pull requests.
-
+ This branch has no conflicts with the base branch.
+
+ Only those with write access to this repository can merge pull requests.
+
}
}
}