From 36d6450977e40d8ea994590e3c9fd60184fe93e4 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 5 Jun 2017 00:10:53 -0400 Subject: repo/pull: detect case when no merge base found (#4434) --- templates/repo/pulls/compare.tmpl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates/repo') 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 @@
{{.i18n.Tr "repo.pulls.nothing_to_compare"}}
+ {{else if .IsNoMergeBase}} +
+ {{.i18n.Tr "repo.pulls.nothing_merge_base"}} +
{{else if .HasPullRequest}}
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} -- cgit v1.2.3