engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: changed the order of close-branch after merge, so we don't leave open heads.

Browse source 
Branches will be closed, and then merged based on the close commit. This is a proper and recommended
workflow for feature branches and close option.
This commit is contained in:
Marcin Kuzminski 2020-07-09 13:09:14 +02:00
parent 3708c3660d
commit 3ca5ca1105
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/model/pull_request.py
View file

@ -2053,9 +2053,9 @@ class MergeCheck(object):
repo_type = pull_request.target_repo.repo_type
close_msg = ''
if repo_type == 'hg':
close_msg = _('Source branch will be closed after merge.')
close_msg = _('Source branch will be closed before the merge.')
elif repo_type == 'git':
close_msg = _('Source branch will be deleted after merge.')
close_msg = _('Source branch will be deleted after the merge.')
merge_details['close_branch'] = dict(
details={},