summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-04-09 21:45:58 +0100
committerGitHub <noreply@github.com>2019-04-09 21:45:58 +0100
commit89cc7c646deea10666fd7dc09c485e7910675cce (patch)
treeb58c1d778e920e9fe46d175ce7e6d28f77dc8fd2 /options
parent7350e439bfa580d6693eac9848353e83e51a3525 (diff)
downloadgitea-89cc7c646deea10666fd7dc09c485e7910675cce.tar.gz
gitea-89cc7c646deea10666fd7dc09c485e7910675cce.zip
Prevent server 500 on compare branches with no common history (#6555)
* Prevent 500 if there is no common mergebase * Prevent creation of PR with no history
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index abcb89767d..2c764f1706 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -684,6 +684,7 @@ editor.cannot_commit_to_protected_branch = Cannot commit to protected branch '%s
commits.desc = Browse source code change history.
commits.commits = Commits
+commits.no_commits = No commits in common. '%s' and '%s' have entirely different histories.
commits.search = Search commits…
commits.find = Search
commits.search_all = All Branches