summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2020-05-06 13:08:45 +0200
committerGitHub <noreply@github.com>2020-05-06 12:08:45 +0100
commit505e456f26e11d4ee2f7a807a037b11b59defb1f (patch)
treef9cbf4daaa54d8ff29e4e2c0e2ab4a21e61e83c5 /options
parenta1f11a05e900f3d1130729b2095dbf1b3037658e (diff)
downloadgitea-505e456f26e11d4ee2f7a807a037b11b59defb1f.tar.gz
gitea-505e456f26e11d4ee2f7a807a037b11b59defb1f.zip
Protect default branch against deletion (#11115)
Although default branch is not offered for deletion in the templates, we need to prevent it both at the router level and in the pre-receive hook. Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
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 37efecbff5..6c98497209 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1683,6 +1683,7 @@ branch.deleted_by = Deleted by %s
branch.restore_success = Branch '%s' has been restored.
branch.restore_failed = Failed to restore branch '%s'.
branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
+branch.default_deletion_failed = Branch '%s' is the default branch. It cannot be deleted.
branch.restore = Restore Branch '%s'
branch.download = Download Branch '%s'
branch.included_desc = This branch is part of the default branch