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

settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.

Browse source
This commit is contained in:
Martin Bornhold 2016-06-27 11:00:22 +02:00
parent b0612b7dc6
commit b3a1dec11e
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/model/forms.py
View file

@ -382,6 +382,7 @@ class _BaseVcsSettingsForm(formencode.Schema):
rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
def ApplicationUiSettingsForm():

4
rhodecode/model/settings.py
View file

@ -401,7 +401,9 @@ class IssueTrackerSettingsModel(object):
class VcsSettingsModel(object):
INHERIT_SETTINGS = 'inherit_vcs_settings'
GENERAL_SETTINGS = ('use_outdated_comments', 'pr_merge_enabled')
GENERAL_SETTINGS = (
'use_outdated_comments', 'pr_merge_enabled',
'hg_use_rebase_for_merging')
HOOKS_SETTINGS = (
('hooks', 'changegroup.repo_size'),
('hooks', 'changegroup.push_logger'),