pull-requests: use close action with proper --close-commit solution.

- Mercurial settings are no long as LABS
- Unified some code between GIT and HG on rebase/close/delete feature branches
This commit is contained in:
Marcin Kuzminski 2017-08-24 22:36:34 +02:00
parent 761e973359
commit 990994942d
9 changed files with 118 additions and 60 deletions

View file

@ -534,6 +534,8 @@ get_repo_settings
"phases_publish": "True",
"rhodecode_hg_use_rebase_for_merging": true,
"rhodecode_hg_close_branch_before_merging": false,
"rhodecode_git_use_rebase_for_merging": true,
"rhodecode_git_close_branch_before_merging": false,
"rhodecode_pr_merge_enabled": true,
"rhodecode_use_outdated_comments": true
}