aboutsummaryrefslogtreecommitdiff
path: root/templates/repo/pulls
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-06-05 00:10:53 -0400
committerUnknwon <u@gogs.io>2017-06-05 00:10:53 -0400
commit36d6450977e40d8ea994590e3c9fd60184fe93e4 (patch)
tree411da811a540a8e6709a770ce392b9d5c58b54a8 /templates/repo/pulls
parent02a576a6a0ce6522b7b6af70bc2eea2de3f534d6 (diff)
repo/pull: detect case when no merge base found (#4434)
Diffstat (limited to 'templates/repo/pulls')
-rw-r--r--templates/repo/pulls/compare.tmpl4
1 files changed, 4 insertions, 0 deletions
diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl
index 5b71fa52..b534561a 100644
--- a/templates/repo/pulls/compare.tmpl
+++ b/templates/repo/pulls/compare.tmpl
@@ -50,6 +50,10 @@
<div class="ui segment">
{{.i18n.Tr "repo.pulls.nothing_to_compare"}}
</div>
+ {{else if .IsNoMergeBase}}
+ <div class="ui segment">
+ {{.i18n.Tr "repo.pulls.nothing_merge_base"}}
+ </div>
{{else if .HasPullRequest}}
<div class="ui segment">
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}}