gitea/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-06-21 21:48:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve the way how branches are deleted

Browse Source 
Delete branch from HeadRepo instead of BaseRepo
Prevent the deletion of a master branch
Show a yes/no overlay when you press the delete branch button
This commit is contained in:
Bwko
2016-12-25 17:19:25 +01:00
committed by Kim "BKC" Carlbäcker
parent 71634452e1
commit 71dee6b7c0
4 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
options/locale/locale_en-US.ini
View File

@ -591,7 +591,6 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b
pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
pulls.merge_pull_request = Merge Pull Request
pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
pulls.delete_branch = Delete Branch
milestones.new = New Milestone
milestones.open_tab = %d Open
@ -815,6 +814,14 @@ release.tag_name_already_exist = Release with this tag name already exists.
release.tag_name_invalid = Tag name is not valid.
release.downloads = Downloads
branch.delete = Delete Branch %s
branch.delete_desc = Once you delete a branch, there is no going back. Please be certain.
branch.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone.
branch.delete_notices_2 = - This operation will permanently delete everything of branch %s.
branch.deletion_success = %s has been deleted successfully!
branch.deletion_failed = Failed to delete branch %s.
branch.delete_branch_has_new_commits = %s cannot be deleted because it has new commits after mergence.
[org]
org_name_holder = Organization Name
org_full_name_holder = Organization Full Name