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

tests: Fix a test that was broken due to changes around the rebase-merge option.

Browse source
This commit is contained in:
Martin Bornhold 2016-07-12 11:09:35 +02:00
parent 0f11ae75ae
commit 84b0a535bb
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/tests/models/settings/test_vcs_settings.py
View file

@ -39,7 +39,8 @@ SVN_FORM_DATA = {
GENERAL_FORM_DATA = {
'rhodecode_pr_merge_enabled': True,
'rhodecode_use_outdated_comments': True
'rhodecode_use_outdated_comments': True,
'rhodecode_hg_use_rebase_for_merging': True,
}